diff options
| -rw-r--r-- | include/toolkit/controls/formattedcontrol.hxx | 2 | ||||
| -rw-r--r-- | include/toolkit/controls/unocontrolmodel.hxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/formattedcontrol.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx index 44584c4e9f2e..ac53bd4bd021 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/include/toolkit/controls/formattedcontrol.hxx @@ -51,7 +51,7 @@ namespace toolkit ::com::sun::star::uno::Any& rOldValue, sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue - ) throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + ) throw (::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index dd872bb44582..ec14fe3cdf1a 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -159,7 +159,7 @@ public: // ::cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE = 0; - sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; using cppu::OPropertySetHelper::getFastPropertyValue; void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 2a002ec46677..bd2b7b56cf4e 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -327,7 +327,7 @@ namespace toolkit sal_Bool UnoControlFormattedFieldModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nPropId, - const Any& rValue ) throw (IllegalArgumentException) + const Any& rValue ) throw (IllegalArgumentException, std::exception) { if ( BASEPROPERTY_EFFECTIVE_DEFAULT == nPropId && rValue.hasValue() ) { diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 6babb44ced15..371751a1d886 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -1040,7 +1040,7 @@ sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) throw( return Sequence< OUString >( &sName, 1 ); } -sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nPropId, const Any& rValue ) throw (IllegalArgumentException) +sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nPropId, const Any& rValue ) throw (IllegalArgumentException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); |