coverity#1372386 Uncaught exception

Change-Id: Ic1fd5486e6b26718086d2f062459f11c00f244d2
This commit is contained in:
Caolán McNamara 2016-08-31 21:38:35 +01:00
parent 50caee009b
commit a6bc2ace5f
6 changed files with 8 additions and 10 deletions

View File

@ -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?" );

View File

@ -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)

View File

@ -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)

View File

@ -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;

View File

@ -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;

View File

@ -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