Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4096

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/4096/1

setPropertyValue can throw PropertyVetoException

fixes abort in report design when entering e.g. invalid positions or size for control

Change-Id: I38835ed79d5bee15c4d7b57ab6780050d250732a
---
M extensions/source/propctrlr/propertycomposer.cxx
M extensions/source/propctrlr/propertycomposer.hxx
2 files changed, 4 insertions(+), 2 deletions(-)



diff --git a/extensions/source/propctrlr/propertycomposer.cxx 
b/extensions/source/propctrlr/propertycomposer.cxx
index c80bdf7..0629d70 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -129,7 +129,7 @@
     }
 
     //--------------------------------------------------------------------
-    void SAL_CALL PropertyComposer::setPropertyValue( const ::rtl::OUString& _rPropertyName, const 
Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
+    void SAL_CALL PropertyComposer::setPropertyValue( const ::rtl::OUString& _rPropertyName, const 
Any& _rValue ) throw (UnknownPropertyException, RuntimeException, PropertyVetoException)
     {
         MethodGuard aGuard( *this );
         ::std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(), SetPropertyValue( 
_rPropertyName, _rValue ) );
diff --git a/extensions/source/propctrlr/propertycomposer.hxx 
b/extensions/source/propctrlr/propertycomposer.hxx
index 68e4cee..0f9ac5f 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -27,6 +27,8 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/beans/UnknownPropertyException.hpp>
+#include <com/sun/star/beans/PropertyVetoException.hpp>
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/listenernotification.hxx>
@@ -78,7 +80,7 @@
         // XPropertyHandler overridables
         virtual void                                SAL_CALL inspect( const 
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw 
(::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Any          SAL_CALL getPropertyValue( const 
::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::uno::RuntimeException);
-        virtual void                                SAL_CALL setPropertyValue( const 
::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw 
(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+        virtual void                                SAL_CALL setPropertyValue( const 
::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw 
(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, 
::com::sun::star::beans::PropertyVetoException);
         virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& 
_rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw 
(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& 
_rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const 
::com::sun::star::uno::Type& _rControlValueType ) throw 
(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::beans::PropertyState

-- 
To view, visit https://gerrit.libreoffice.org/4096
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38835ed79d5bee15c4d7b57ab6780050d250732a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane <lionel@mamane.lu>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.