diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-05-30 14:25:27 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-30 23:47:53 +0200 |
| commit | b0fff1a245f7c026815827294bccc20bbd0ed104 (patch) | |
| tree | d7c1ba0969c31d53e6637dac475506d0a45269ba /extensions | |
| parent | b3c1547c7e2a09450c0249b69e58800c1c48a19b (diff) | |
setPropertyValue can throw PropertyVetoException
fixes abort in report design when entering e.g. invalid positions or size for control
Change-Id: I38835ed79d5bee15c4d7b57ab6780050d250732a
Reviewed-on: https://gerrit.libreoffice.org/4096
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/propertycomposer.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/propertycomposer.hxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index c80bdf7ba104..0629d7023737 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.cxx @@ -129,7 +129,7 @@ namespace pcr } //-------------------------------------------------------------------- - 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 68e4cee46b14..0f9ac5ff4ec8 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 @@ namespace pcr // 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 |