diff options
| -rw-r--r-- | framework/inc/services/desktop.hxx | 2 | ||||
| -rw-r--r-- | framework/source/services/desktop.cxx | 2 | ||||
| -rw-r--r-- | include/cppuhelper/propshlp.hxx | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 57e0bdb0f2bc..19a6df5800f9 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -309,7 +309,7 @@ class Desktop : private cppu::BaseMutex, virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue , css::uno::Any& aOldValue , sal_Int32 nHandle , - const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ) SAL_OVERRIDE; + const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) SAL_OVERRIDE; using cppu::OPropertySetHelper::getFastPropertyValue; diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index a62c649414f9..10bb545f1464 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1316,7 +1316,7 @@ OUString SAL_CALL Desktop::getUntitledPrefix() sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aConvertedValue , css::uno::Any& aOldValue , sal_Int32 nHandle , - const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ) + const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index cc462c16ef33..89a88bd97548 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -575,7 +575,8 @@ protected: ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) = 0; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) = 0; /** The same as setFastProperyValue; nHandle is always valid. The changes must not be broadcasted in this method. |