diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-05 08:07:32 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-05 08:17:46 +0200 |
commit | 41066fef1ca94723615838fd521d08c5d37aac5b (patch) | |
tree | 96a9d0de50b748359676cf43b879ba6d3406af0f /comphelper | |
parent | ...and avoid SolarMutex deadlock when joining FactoryLoader threads (diff) | |
download | core-41066fef1ca94723615838fd521d08c5d37aac5b.tar.gz core-41066fef1ca94723615838fd521d08c5d37aac5b.zip |
comphelper: remove SAL_THROW macro
Change-Id: I692f1213c4bf42a84fae119f513e609d8874bf0c
Diffstat (limited to 'comphelper')
6 files changed, 12 insertions, 12 deletions
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index f28d6d383a28..1de52115dfed 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -132,7 +132,7 @@ private: @return the iterator pointing to the position indicated by the index */ - ::std::deque<AttacherIndex_Impl>::iterator implCheckIndex( sal_Int32 _nIndex ) SAL_THROW ( ( IllegalArgumentException ) ); + ::std::deque<AttacherIndex_Impl>::iterator implCheckIndex( sal_Int32 _nIndex ); }; @@ -395,7 +395,7 @@ Reference< XIdlReflection > ImplEventAttacherManager::getReflection() throw( Exc -::std::deque<AttacherIndex_Impl>::iterator ImplEventAttacherManager::implCheckIndex( sal_Int32 _nIndex ) SAL_THROW ( ( IllegalArgumentException ) ) +::std::deque<AttacherIndex_Impl>::iterator ImplEventAttacherManager::implCheckIndex( sal_Int32 _nIndex ) { if (_nIndex < 0) throw IllegalArgumentException(); diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index 0daab3529fdc..718c83a78449 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -202,7 +202,7 @@ namespace comphelper } - void OAccessibleContextHelper::ensureAlive() const SAL_THROW( ( DisposedException ) ) + void OAccessibleContextHelper::ensureAlive() const { if( !isAlive() ) throw DisposedException(); @@ -293,7 +293,7 @@ namespace comphelper } - Reference< XAccessibleContext > OAccessibleContextHelper::implGetParentContext() SAL_THROW( ( RuntimeException ) ) + Reference< XAccessibleContext > OAccessibleContextHelper::implGetParentContext() { Reference< XAccessible > xParent = getAccessibleParent(); Reference< XAccessibleContext > xParentContext; diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index 9f9c90df6750..2282c9f81729 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.cxx @@ -189,7 +189,7 @@ namespace comphelper void AccessibleEventNotifier::revokeClientNotifyDisposing( const TClientId _nClient, - const Reference< XInterface >& _rxEventSource ) SAL_THROW( ( ) ) + const Reference< XInterface >& _rxEventSource ) { ::cppu::OInterfaceContainerHelper* pListeners(0); @@ -224,7 +224,7 @@ namespace comphelper sal_Int32 AccessibleEventNotifier::addEventListener( - const TClientId _nClient, const Reference< XAccessibleEventListener >& _rxListener ) SAL_THROW( ( ) ) + const TClientId _nClient, const Reference< XAccessibleEventListener >& _rxListener ) { ::osl::MutexGuard aGuard( lclMutex::get() ); @@ -241,7 +241,7 @@ namespace comphelper sal_Int32 AccessibleEventNotifier::removeEventListener( - const TClientId _nClient, const Reference< XAccessibleEventListener >& _rxListener ) SAL_THROW( ( ) ) + const TClientId _nClient, const Reference< XAccessibleEventListener >& _rxListener ) { ::osl::MutexGuard aGuard( lclMutex::get() ); @@ -257,7 +257,7 @@ namespace comphelper } - void AccessibleEventNotifier::addEvent( const TClientId _nClient, const AccessibleEventObject& _rEvent ) SAL_THROW( ( ) ) + void AccessibleEventNotifier::addEvent( const TClientId _nClient, const AccessibleEventObject& _rEvent ) { Sequence< Reference< XInterface > > aListeners; diff --git a/comphelper/source/misc/listenernotification.cxx b/comphelper/source/misc/listenernotification.cxx index c933219cf819..481821dc0dc3 100644 --- a/comphelper/source/misc/listenernotification.cxx +++ b/comphelper/source/misc/listenernotification.cxx @@ -76,7 +76,7 @@ namespace comphelper } - bool OListenerContainer::impl_notify( const EventObject& _rEvent ) SAL_THROW(( Exception )) + bool OListenerContainer::impl_notify( const EventObject& _rEvent ) { ::cppu::OInterfaceIteratorHelper aIter( m_aListeners ); bool bCancelled = false; diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index fca26062e0ad..62be2f65695a 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -221,7 +221,7 @@ namespace bool OPropertyContainerHelper::convertFastPropertyValue( - Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) SAL_THROW( (IllegalArgumentException) ) + Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) { bool bModified = false; @@ -366,7 +366,7 @@ bool OPropertyContainerHelper::convertFastPropertyValue( } -void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const Any& _rValue) SAL_THROW( (Exception) ) +void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const Any& _rValue) { // get the property somebody is asking for PropertiesIterator aPos = searchHandle(_nHandle); diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx index 550692ffa280..4e41561ed4b0 100644 --- a/comphelper/source/property/propertystatecontainer.cxx +++ b/comphelper/source/property/propertystatecontainer.cxx @@ -67,7 +67,7 @@ namespace comphelper IMPLEMENT_FORWARD_XTYPEPROVIDER2( OPropertyStateContainer, OPropertyContainer, OPropertyStateContainer_TBase ) - sal_Int32 OPropertyStateContainer::getHandleForName( const OUString& _rPropertyName ) SAL_THROW( ( UnknownPropertyException ) ) + sal_Int32 OPropertyStateContainer::getHandleForName( const OUString& _rPropertyName ) { // look up the handle for the name ::cppu::IPropertyArrayHelper& rPH = getInfoHelper(); |