summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/source/property/propagg.cxx4
-rw-r--r--forms/source/component/FormComponent.cxx4
-rw-r--r--forms/source/component/ListBox.cxx2
-rw-r--r--forms/source/component/ListBox.hxx2
-rw-r--r--forms/source/inc/FormComponent.hxx4
-rw-r--r--include/comphelper/propagg.hxx2
6 files changed, 8 insertions, 10 deletions
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index ed91935a65b5..5225a7efcd43 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -851,8 +851,7 @@ css::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const O
return getPropertyDefaultByHandle(nHandle);
}
-
-sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException)
+sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException, std::exception)
{
bool bModified = false;
@@ -872,7 +871,6 @@ sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any&
return bModified;
}
-
void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception )
{
OSL_ENSURE( m_pForwarder->isResponsibleFor( _nHandle ), "OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast: this is no forwarded property - did you use declareForwardedProperty for it?" );
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 431501c6067e..9ff9a58f0412 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -937,7 +937,7 @@ void OControlModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) con
sal_Bool OControlModel::convertFastPropertyValue(
Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
- throw (css::lang::IllegalArgumentException)
+ throw (css::lang::IllegalArgumentException, std::exception)
{
bool bModified(false);
switch (_nHandle)
@@ -1642,7 +1642,7 @@ sal_Bool OBoundControlModel::convertFastPropertyValue(
Any& _rConvertedValue, Any& _rOldValue,
sal_Int32 _nHandle,
const Any& _rValue)
- throw (css::lang::IllegalArgumentException)
+ throw (css::lang::IllegalArgumentException, std::exception)
{
bool bModified(false);
switch (_nHandle)
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 006a2bec2143..9d54a9b501c7 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -390,7 +390,7 @@ namespace frm
sal_Bool OListBoxModel::convertFastPropertyValue(
Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
- throw (IllegalArgumentException)
+ throw (IllegalArgumentException, std::exception)
{
bool bModified(false);
switch (_nHandle)
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 702332eaef37..b1e32e2550e9 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -146,7 +146,7 @@ public:
throw (css::uno::Exception, std::exception) override;
virtual sal_Bool SAL_CALL convertFastPropertyValue(
css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
- throw (css::lang::IllegalArgumentException) override;
+ throw (css::lang::IllegalArgumentException, std::exception) override;
protected:
static const ::connectivity::ORowSetValue s_aEmptyValue;
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index da3bb20a575e..1b7c08d488a1 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -425,7 +425,7 @@ public:
virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
virtual sal_Bool SAL_CALL convertFastPropertyValue(
css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
- throw (css::lang::IllegalArgumentException) override;
+ throw (css::lang::IllegalArgumentException, std::exception) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
throw (css::uno::Exception, std::exception) override;
using ::cppu::OPropertySetHelper::getFastPropertyValue;
@@ -1002,7 +1002,7 @@ public:
virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
virtual sal_Bool SAL_CALL convertFastPropertyValue(
css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
- throw (css::lang::IllegalArgumentException) override;
+ throw (css::lang::IllegalArgumentException, std::exception) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
throw (css::uno::Exception, std::exception) override;
using ::cppu::OPropertySetHelper::getFastPropertyValue;
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 68fafa01d0be..2ecc05b5156b 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -247,7 +247,7 @@ public:
/** only implemented for "forwarded" properties, every other property must be handled
in the derivee, and will assert if passed herein
*/
- virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw(css::lang::IllegalArgumentException) override;
+ virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw(css::lang::IllegalArgumentException, std::exception) override;
/** only implemented for "forwarded" properties, every other property must be handled
in the derivee, and will assert if passed herein
generated by cgit (git 2.34.1) at 2025-02-13 02:57:36 +0000