summaryrefslogtreecommitdiff
path: root/comphelper/source/property/propagg.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /comphelper/source/property/propagg.cxx
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'comphelper/source/property/propagg.cxx')
-rw-r--r--comphelper/source/property/propagg.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index c4a66b68d4cb..30fe378a5e59 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -454,7 +454,7 @@ OPropertySetAggregationHelper::~OPropertySetAggregationHelper()
}
- ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException)
+ ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException, std::exception)
{
::com::sun::star::uno::Any aReturn = OPropertyStateHelper::queryInterface(_rType);
@@ -485,7 +485,7 @@ void OPropertySetAggregationHelper::disposing()
}
-void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star::lang::EventObject& _rSource) throw ( ::com::sun::star::uno::RuntimeException)
+void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star::lang::EventObject& _rSource) throw ( ::com::sun::star::uno::RuntimeException, std::exception)
{
OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::disposing : don't have an aggregate anymore !");
if (_rSource.Source == m_xAggregateSet)
@@ -493,7 +493,7 @@ void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star::
}
-void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent>& _rEvents) throw( ::com::sun::star::uno::RuntimeException)
+void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent>& _rEvents) throw( ::com::sun::star::uno::RuntimeException, std::exception)
{
OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::propertiesChange : have no aggregate !");
@@ -545,7 +545,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun:
}
-void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception)
{
OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::vetoableChange : have no aggregate !");
@@ -597,7 +597,7 @@ void OPropertySetAggregationHelper::startListening()
void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUString& _rPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& _rxListener)
- throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+ throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
{
OPropertySetHelper::addVetoableChangeListener(_rPropertyName, _rxListener);
if (!m_bListening)
@@ -607,7 +607,7 @@ void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUS
void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUString& _rPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& _rxListener)
- throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+ throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
{
OPropertySetHelper::addPropertyChangeListener(_rPropertyName, _rxListener);
if (!m_bListening)
@@ -617,7 +617,7 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUS
void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener>& _rxListener)
- throw( ::com::sun::star::uno::RuntimeException)
+ throw( ::com::sun::star::uno::RuntimeException, std::exception)
{
OPropertySetHelper::addPropertiesChangeListener(_rPropertyNames, _rxListener);
if (!m_bListening)
@@ -646,7 +646,7 @@ OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) co
void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue)
throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException)
+ ::com::sun::star::uno::RuntimeException, std::exception)
{
OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
OUString aPropName;
@@ -688,7 +688,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno:
::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_Int32 nHandle)
throw( ::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException)
+ ::com::sun::star::uno::RuntimeException, std::exception)
{
OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
OUString aPropName;
@@ -711,7 +711,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno:
void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues )
- throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
+ throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
{
OSL_ENSURE( !rBHelper.bInDispose, "OPropertySetAggregationHelper::setPropertyValues : do not use within the dispose call !");
OSL_ENSURE( !rBHelper.bDisposed, "OPropertySetAggregationHelper::setPropertyValues : object is disposed" );
@@ -897,7 +897,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
// XPropertyState
::com::sun::star::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName)
- throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
+ throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)
{
OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
sal_Int32 nHandle = rPH.getHandleByName( _rPropertyName );
@@ -922,7 +922,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString& _rPropertyName)
- throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
+ throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)
{
OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
sal_Int32 nHandle = rPH.getHandleByName(_rPropertyName);
@@ -955,7 +955,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString
::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName)
- throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+ throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
{
OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
sal_Int32 nHandle = rPH.getHandleByName( aPropertyName );
@@ -998,7 +998,7 @@ sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any&
}
-void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception )
+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?" );
if ( m_pForwarder->isResponsibleFor( _nHandle ) )