cppuhelper: remove SAL_THROW macro

Change-Id: I54141071396d04e7bead56da14a665b8556ba6d2

1 files changed, 25 insertions, 31 deletions

diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index fb59703ca42d..22f090b08d23 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -40,7 +40,6 @@ namespace cppu
  * Reallocate the sequence.
  */
 static void realloc( Sequence< Reference< XInterface > > & rSeq, sal_Int32 nNewLen )
-    SAL_THROW(())
 {
     rSeq.realloc( nNewLen );
 }
@@ -49,7 +48,6 @@ static void realloc( Sequence< Reference< XInterface > > & rSeq, sal_Int32 nNewL
  * Remove an element from an interface sequence.
  */
 static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > & rSeq, sal_Int32 index )
-    SAL_THROW(())
 {
     sal_Int32 nNewLen = rSeq.getLength() - 1;
 
@@ -70,7 +68,6 @@ static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > & rSeq,
 #endif
 
 OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont_ )
-    SAL_THROW(())
     : rCont( rCont_ )
 {
     MutexGuard aGuard( rCont.rMutex );
@@ -93,7 +90,7 @@ OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper &
         nRemain = 0;
 }
 
-OInterfaceIteratorHelper::~OInterfaceIteratorHelper() SAL_THROW(())
+OInterfaceIteratorHelper::~OInterfaceIteratorHelper()
 {
     bool bShared;
     {
@@ -118,7 +115,7 @@ OInterfaceIteratorHelper::~OInterfaceIteratorHelper() SAL_THROW(())
     }
 }
 
-XInterface * OInterfaceIteratorHelper::next() SAL_THROW(())
+XInterface * OInterfaceIteratorHelper::next()
 {
     if( nRemain )
     {
@@ -133,7 +130,7 @@ XInterface * OInterfaceIteratorHelper::next() SAL_THROW(())
     return 0;
 }
 
-void OInterfaceIteratorHelper::remove() SAL_THROW(())
+void OInterfaceIteratorHelper::remove()
 {
     if( bIsList )
     {
@@ -149,14 +146,14 @@ void OInterfaceIteratorHelper::remove() SAL_THROW(())
     }
 }
 
-OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ ) SAL_THROW(())
+OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ )
     : rMutex( rMutex_ )
     , bInUse( sal_False )
     , bIsList( sal_False )
 {
 }
 
-OInterfaceContainerHelper::~OInterfaceContainerHelper() SAL_THROW(())
+OInterfaceContainerHelper::~OInterfaceContainerHelper()
 {
     OSL_ENSURE( !bInUse, "~OInterfaceContainerHelper but is in use" );
     if( bIsList )
@@ -165,7 +162,7 @@ OInterfaceContainerHelper::~OInterfaceContainerHelper() SAL_THROW(())
         aData.pAsInterface->release();
 }
 
-sal_Int32 OInterfaceContainerHelper::getLength() const SAL_THROW(())
+sal_Int32 OInterfaceContainerHelper::getLength() const
 {
     MutexGuard aGuard( rMutex );
     if( bIsList )
@@ -175,7 +172,7 @@ sal_Int32 OInterfaceContainerHelper::getLength() const SAL_THROW(())
     return 0;
 }
 
-Sequence< Reference<XInterface> > OInterfaceContainerHelper::getElements() const SAL_THROW(())
+Sequence< Reference<XInterface> > OInterfaceContainerHelper::getElements() const
 {
     MutexGuard aGuard( rMutex );
     if( bIsList )
@@ -188,7 +185,7 @@ Sequence< Reference<XInterface> > OInterfaceContainerHelper::getElements() const
     return Sequence< Reference< XInterface > >();
 }
 
-void OInterfaceContainerHelper::copyAndResetInUse() SAL_THROW(())
+void OInterfaceContainerHelper::copyAndResetInUse()
 {
     OSL_ENSURE( bInUse, "OInterfaceContainerHelper not in use" );
     if( bInUse )
@@ -204,7 +201,7 @@ void OInterfaceContainerHelper::copyAndResetInUse() SAL_THROW(())
     }
 }
 
-sal_Int32 OInterfaceContainerHelper::addInterface( const Reference<XInterface> & rListener ) SAL_THROW(())
+sal_Int32 OInterfaceContainerHelper::addInterface( const Reference<XInterface> & rListener )
 {
     OSL_ASSERT( rListener.is() );
     MutexGuard aGuard( rMutex );
@@ -238,7 +235,7 @@ sal_Int32 OInterfaceContainerHelper::addInterface( const Reference<XInterface> &
     }
 }
 
-sal_Int32 OInterfaceContainerHelper::removeInterface( const Reference<XInterface> & rListener ) SAL_THROW(())
+sal_Int32 OInterfaceContainerHelper::removeInterface( const Reference<XInterface> & rListener )
 {
     OSL_ASSERT( rListener.is() );
     MutexGuard aGuard( rMutex );
@@ -294,7 +291,7 @@ sal_Int32 OInterfaceContainerHelper::removeInterface( const Reference<XInterface
     return aData.pAsInterface ? 1 : 0;
 }
 
-void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) SAL_THROW(())
+void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt )
 {
     ClearableMutexGuard aGuard( rMutex );
     OInterfaceIteratorHelper aIt( *this );
@@ -324,7 +321,7 @@ void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) SAL_
 }
 
 
-void OInterfaceContainerHelper::clear() SAL_THROW(())
+void OInterfaceContainerHelper::clear()
 {
     ClearableMutexGuard aGuard( rMutex );
     OInterfaceIteratorHelper aIt( *this );
@@ -345,13 +342,12 @@ void OInterfaceContainerHelper::clear() SAL_THROW(())
 typedef ::std::vector< std::pair < Type , void* > > t_type2ptr;
 
 OMultiTypeInterfaceContainerHelper::OMultiTypeInterfaceContainerHelper( Mutex & rMutex_ )
-    SAL_THROW(())
     : rMutex( rMutex_ )
 {
     m_pMap = new t_type2ptr();
 }
+
 OMultiTypeInterfaceContainerHelper::~OMultiTypeInterfaceContainerHelper()
-    SAL_THROW(())
 {
     t_type2ptr * pMap = (t_type2ptr *)m_pMap;
     t_type2ptr::iterator iter = pMap->begin();
@@ -365,8 +361,8 @@ OMultiTypeInterfaceContainerHelper::~OMultiTypeInterfaceContainerHelper()
     }
     delete pMap;
 }
+
 Sequence< Type > OMultiTypeInterfaceContainerHelper::getContainedTypes() const
-    SAL_THROW(())
 {
     t_type2ptr * pMap = (t_type2ptr *)m_pMap;
     t_type2ptr::size_type nSize;
@@ -414,7 +410,6 @@ static t_type2ptr::iterator findType(t_type2ptr *pMap, const Type & rKey )
 }
 
 OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelper::getContainer( const Type & rKey ) const
-    SAL_THROW(())
 {
     ::osl::MutexGuard aGuard( rMutex );
 
@@ -424,9 +419,9 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelper::getContainer( co
             return (OInterfaceContainerHelper*) (*iter).second;
     return 0;
 }
+
 sal_Int32 OMultiTypeInterfaceContainerHelper::addInterface(
     const Type & rKey, const Reference< XInterface > & rListener )
-    SAL_THROW(())
 {
     ::osl::MutexGuard aGuard( rMutex );
     t_type2ptr * pMap = (t_type2ptr *)m_pMap;
@@ -440,9 +435,9 @@ sal_Int32 OMultiTypeInterfaceContainerHelper::addInterface(
     else
         return ((OInterfaceContainerHelper*)(*iter).second)->addInterface( rListener );
 }
+
 sal_Int32 OMultiTypeInterfaceContainerHelper::removeInterface(
     const Type & rKey, const Reference< XInterface > & rListener )
-    SAL_THROW(())
 {
     ::osl::MutexGuard aGuard( rMutex );
 
@@ -456,8 +451,8 @@ sal_Int32 OMultiTypeInterfaceContainerHelper::removeInterface(
     // no container with this id. Always return 0
     return 0;
 }
+
 void OMultiTypeInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt )
-    SAL_THROW(())
 {
     t_type2ptr::size_type nSize = 0;
     OInterfaceContainerHelper ** ppListenerContainers = NULL;
@@ -493,8 +488,8 @@ void OMultiTypeInterfaceContainerHelper::disposeAndClear( const EventObject & rE
 
     delete [] ppListenerContainers;
 }
+
 void OMultiTypeInterfaceContainerHelper::clear()
-    SAL_THROW(())
 {
     ::osl::MutexGuard aGuard( rMutex );
     t_type2ptr * pMap = (t_type2ptr *)m_pMap;
@@ -527,14 +522,13 @@ static t_long2ptr::iterator findLong(t_long2ptr *pMap, sal_Int32 nKey )
 }
 
 OMultiTypeInterfaceContainerHelperInt32::OMultiTypeInterfaceContainerHelperInt32( Mutex & rMutex_ )
-    SAL_THROW(())
     : m_pMap( NULL )
     , rMutex( rMutex_ )
 {
     // delay pMap allocation until necessary.
 }
+
 OMultiTypeInterfaceContainerHelperInt32::~OMultiTypeInterfaceContainerHelperInt32()
-    SAL_THROW(())
 {
     if (!m_pMap)
         return;
@@ -551,8 +545,8 @@ OMultiTypeInterfaceContainerHelperInt32::~OMultiTypeInterfaceContainerHelperInt3
     }
     delete pMap;
 }
+
 Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes() const
-    SAL_THROW(())
 {
     t_long2ptr * pMap = (t_long2ptr *)m_pMap;
     t_long2ptr::size_type nSize;
@@ -584,8 +578,8 @@ Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes
     }
     return ::com::sun::star::uno::Sequence< sal_Int32 >();
 }
+
 OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperInt32::getContainer( const sal_Int32 & rKey ) const
-    SAL_THROW(())
 {
     ::osl::MutexGuard aGuard( rMutex );
 
@@ -597,9 +591,9 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperInt32::getContaine
             return (OInterfaceContainerHelper*) (*iter).second;
     return 0;
 }
+
 sal_Int32 OMultiTypeInterfaceContainerHelperInt32::addInterface(
     const sal_Int32 & rKey, const Reference< XInterface > & rListener )
-    SAL_THROW(())
 {
     ::osl::MutexGuard aGuard( rMutex );
     if (!m_pMap)
@@ -615,9 +609,9 @@ sal_Int32 OMultiTypeInterfaceContainerHelperInt32::addInterface(
     else
         return ((OInterfaceContainerHelper*)(*iter).second)->addInterface( rListener );
 }
+
 sal_Int32 OMultiTypeInterfaceContainerHelperInt32::removeInterface(
     const sal_Int32 & rKey, const Reference< XInterface > & rListener )
-    SAL_THROW(())
 {
     ::osl::MutexGuard aGuard( rMutex );
 
@@ -633,8 +627,8 @@ sal_Int32 OMultiTypeInterfaceContainerHelperInt32::removeInterface(
     // no container with this id. Always return 0
     return 0;
 }
+
 void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject & rEvt )
-    SAL_THROW(())
 {
     t_long2ptr::size_type nSize = 0;
     OInterfaceContainerHelper ** ppListenerContainers = NULL;
@@ -672,8 +666,8 @@ void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject
 
     delete [] ppListenerContainers;
 }
+
 void OMultiTypeInterfaceContainerHelperInt32::clear()
-    SAL_THROW(())
 {
     ::osl::MutexGuard aGuard( rMutex );
     if (!m_pMap)