cppuhelper: remove SAL_THROW macro

Change-Id: I54141071396d04e7bead56da14a665b8556ba6d2

cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx

@@ -376,7 +376,6 @@ private:
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL create(
     css::uno::Reference< css::uno::XComponentContext > const & context)
-    SAL_THROW((css::uno::Exception))
 {
     return static_cast< cppu::OWeakObject * >(new Supplier(context));
 }

cppuhelper/source/access_control.cxx

@@ -43,7 +43,6 @@ namespace cppu
 {
 
 AccessControl::AccessControl( Reference< XComponentContext > const & xContext )
-    SAL_THROW( (RuntimeException) )
 {
     if (! (xContext->getValueByName( str_ac_singleton() ) >>= m_xController))
     {
@@ -53,7 +52,6 @@ AccessControl::AccessControl( Reference< XComponentContext > const & xContext )
 
 AccessControl::AccessControl(
     Reference< security::XAccessController > const & xController )
-    SAL_THROW( (RuntimeException) )
     : m_xController( xController )
 {
     if (! m_xController.is())
@@ -63,7 +61,6 @@ AccessControl::AccessControl(
 }
 
 AccessControl::AccessControl( AccessControl const & ac )
-    SAL_THROW( (RuntimeException) )
     : m_xController( ac.m_xController )
 {
     if (! m_xController.is())
@@ -89,7 +86,6 @@ AccessControl::AccessControl( AccessControl const & ac )
 inline void __checkPermission(
     Reference< security::XAccessController > const & xController,
     Type const & type, rtl_uString * str1, rtl_uString * str2 )
-    SAL_THROW( (RuntimeException) )
 {
     __permission perm;
     perm.m_str1 = str1;
@@ -104,7 +100,6 @@ inline void __checkPermission(
 
 void AccessControl::checkRuntimePermission(
     OUString const & name )
-    SAL_THROW( (RuntimeException) )
 {
     __checkPermission(
         m_xController,
@@ -114,7 +109,6 @@ void AccessControl::checkRuntimePermission(
 void AccessControl::checkFilePermission(
     OUString const & url,
     OUString const & actions )
-    SAL_THROW( (RuntimeException) )
 {
     __checkPermission(
         m_xController,
@@ -124,7 +118,6 @@ void AccessControl::checkFilePermission(
 void AccessControl::checkSocketPermission(
     OUString const & host,
     OUString const & actions )
-    SAL_THROW( (RuntimeException) )
 {
     __checkPermission(
         m_xController,

cppuhelper/source/compat.cxx

@@ -51,7 +51,7 @@ namespace cppu {
 
 SAL_DLLPUBLIC_EXPORT
 css::uno::Reference< css::lang::XMultiComponentFactory > bootstrapInitialSF(
-    rtl::OUString const &) SAL_THROW((com::sun::star::uno::Exception))
+    rtl::OUString const &)
 {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
@@ -59,26 +59,26 @@ css::uno::Reference< css::lang::XMultiComponentFactory > bootstrapInitialSF(
 SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::uno::XComponentContext > SAL_CALL
 bootstrap_InitialComponentContext(
     css::uno::Reference< css::registry::XSimpleRegistry > const &,
-    rtl::OUString const &) SAL_THROW((css::uno::Exception))
+    rtl::OUString const &)
 {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
 SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::registry::XSimpleRegistry >
-SAL_CALL createNestedRegistry(rtl::OUString const &) SAL_THROW(()) {
+SAL_CALL createNestedRegistry(rtl::OUString const &) {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
 SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::lang::XMultiServiceFactory >
 SAL_CALL createRegistryServiceFactory(
     rtl::OUString const &, rtl::OUString const &, sal_Bool,
-    rtl::OUString const &) SAL_THROW((css::uno::Exception))
+    rtl::OUString const &)
 {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
 SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::registry::XSimpleRegistry >
-SAL_CALL createSimpleRegistry(rtl::OUString const &) SAL_THROW(()) {
+SAL_CALL createSimpleRegistry(rtl::OUString const &) {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
@@ -87,7 +87,7 @@ createStandardClassWithSequence(
     css::uno::Reference< css::lang::XMultiServiceFactory > const &,
     rtl::OUString const &,
     css::uno::Reference< css::reflection::XIdlClass > const &,
-    css::uno::Sequence< rtl::OUString > const &) SAL_THROW(())
+    css::uno::Sequence< rtl::OUString > const &)
 {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
@@ -98,7 +98,6 @@ invokeStaticComponentFactory(
     css::uno::Reference<css::lang::XMultiServiceFactory> const &,
     css::uno::Reference<css::registry::XRegistryKey> const &,
     rtl::OUString const &)
-    SAL_THROW((css::loader::CannotActivateFactoryException))
 {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
@@ -109,7 +108,6 @@ loadSharedLibComponentFactory(
     css::uno::Reference<css::lang::XMultiServiceFactory> const &,
     css::uno::Reference<css::registry::XRegistryKey> const &,
     rtl::OUString const &)
-    SAL_THROW((css::loader::CannotActivateFactoryException))
 {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }

cppuhelper/source/component.cxx

@@ -40,11 +40,11 @@ namespace cppu
 //  class OComponentHelper
 
 
-OComponentHelper::OComponentHelper( Mutex & rMutex ) SAL_THROW(())
+OComponentHelper::OComponentHelper( Mutex & rMutex )
     : rBHelper( rMutex )
 {
 }
-OComponentHelper::~OComponentHelper() SAL_THROW( (RuntimeException) )
+OComponentHelper::~OComponentHelper()
 {
 }
 

cppuhelper/source/component_context.cxx

@@ -266,7 +266,6 @@ static void dumpEntry( OUString const & key, Any const & value )
 #endif
 
 static inline void try_dispose( Reference< XInterface > const & xInstance )
-    SAL_THROW( (RuntimeException) )
 {
     Reference< lang::XComponent > xComp( xInstance, UNO_QUERY );
     if (xComp.is())
@@ -276,7 +275,6 @@ static inline void try_dispose( Reference< XInterface > const & xInstance )
 }
 
 static inline void try_dispose( Reference< lang::XComponent > const & xComp )
-    SAL_THROW( (RuntimeException) )
 {
     if (xComp.is())
     {
@@ -292,15 +290,13 @@ class DisposingForwarder
     Reference< lang::XComponent > m_xTarget;
 
     inline DisposingForwarder( Reference< lang::XComponent > const & xTarget )
-        SAL_THROW(())
         : m_xTarget( xTarget )
         { OSL_ASSERT( m_xTarget.is() ); }
 public:
     // listens at source for disposing, then disposes target
     static inline void listen(
         Reference< lang::XComponent > const & xSource,
-        Reference< lang::XComponent > const & xTarget )
-        SAL_THROW( (RuntimeException) );
+        Reference< lang::XComponent > const & xTarget );
 
     virtual void SAL_CALL disposing( lang::EventObject const & rSource )
         throw (RuntimeException, std::exception) SAL_OVERRIDE;
@@ -309,7 +305,6 @@ public:
 inline void DisposingForwarder::listen(
     Reference< lang::XComponent > const & xSource,
     Reference< lang::XComponent > const & xTarget )
-    SAL_THROW( (RuntimeException) )
 {
     if (xSource.is())
     {
@@ -356,16 +351,14 @@ protected:
     Reference< lang::XMultiComponentFactory > m_xSMgr;
 
 protected:
-    Any lookupMap( OUString const & rName )
-        SAL_THROW( (RuntimeException) );
+    Any lookupMap( OUString const & rName );
 
     virtual void SAL_CALL disposing() SAL_OVERRIDE;
 public:
     ComponentContext(
         ContextEntry_Init const * pEntries, sal_Int32 nEntries,
         Reference< XComponentContext > const & xDelegate );
-    virtual ~ComponentContext()
-        SAL_THROW(());
+    virtual ~ComponentContext();
 
     // XComponentContext
     virtual Any SAL_CALL getValueByName( OUString const & rName )
@@ -511,7 +504,6 @@ sal_Bool ComponentContext::hasElements() throw (RuntimeException, std::exception
 
 
 Any ComponentContext::lookupMap( OUString const & rName )
-    SAL_THROW( (RuntimeException) )
 {
 #ifdef CONTEXT_DIAG
     if ( rName == "dump_maps" )
@@ -663,7 +655,6 @@ Reference< lang::XMultiComponentFactory > ComponentContext::getServiceManager()
 }
 
 ComponentContext::~ComponentContext()
-    SAL_THROW(())
 {
 #ifdef CONTEXT_DIAG
     ::fprintf( stderr, "> destructed context %p\n", this );
@@ -846,7 +837,6 @@ extern "C" { static void s_createComponentContext_v(va_list * pParam)
 Reference< XComponentContext > SAL_CALL createComponentContext(
     ContextEntry_Init const * pEntries, sal_Int32 nEntries,
     Reference< XComponentContext > const & xDelegate )
-    SAL_THROW(())
 {
     uno::Environment curr_env(Environment::getCurrent());
     uno::Environment source_env(CPPU_CURRENT_LANGUAGE_BINDING_NAME);

cppuhelper/source/defaultbootstrap.cxx

@@ -46,7 +46,6 @@ rtl::OUString getBootstrapVariable(
 
 css::uno::Reference< css::uno::XComponentContext >
 cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri)
-    SAL_THROW((css::uno::Exception))
 {
     rtl::Bootstrap bs(iniUri);
     if (bs.getHandle() == 0) {
@@ -103,7 +102,6 @@ cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri)
 
 css::uno::Reference< css::uno::XComponentContext >
 cppu::defaultBootstrap_InitialComponentContext()
-    SAL_THROW((css::uno::Exception))
 {
     return defaultBootstrap_InitialComponentContext(getUnoIniUri());
 }

cppuhelper/source/exc_thrower.cxx

@@ -183,7 +183,7 @@ namespace cppu
 {
 
 
-void SAL_CALL throwException( Any const & exc ) SAL_THROW( (Exception) )
+void SAL_CALL throwException( Any const & exc )
 {
     if (exc.getValueTypeClass() != TypeClass_EXCEPTION)
     {

cppuhelper/source/factory.cxx

@@ -70,7 +70,6 @@ public:
         ComponentInstantiation pCreateFunction_,
         ComponentFactoryFunc fptr,
         const Sequence< OUString > * pServiceNames_ )
-        SAL_THROW(())
         : xSMgr( rServiceManager )
         , pCreateFunction( pCreateFunction_ )
         , m_fptr( fptr )
@@ -265,7 +264,6 @@ public:
         ComponentFactoryFunc fptr,
         const Sequence< OUString > * pServiceNames_,
         bool bOneInstance_ = false )
-        SAL_THROW(())
         : OComponentHelper( aMutex )
         , OSingleFactoryHelper( rServiceManager, rImplementationName_, pCreateFunction_, fptr, pServiceNames_ )
         , bOneInstance( bOneInstance_ )
@@ -477,7 +475,7 @@ public:
         const Reference<XMultiServiceFactory > & rServiceManager,
         const OUString & rImplementationName_,
         const Reference<XRegistryKey > & xImplementationKey_,
-        bool bOneInstance_ = false ) SAL_THROW(())
+        bool bOneInstance_ = false )
             : OFactoryComponentHelper(
                 rServiceManager, rImplementationName_, 0, 0, 0, bOneInstance_ ),
               OPropertySetHelper( OComponentHelper::rBHelper ),
@@ -883,7 +881,6 @@ class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleService
 public:
 
     OFactoryProxyHelper( const Reference<XSingleServiceFactory > & rFactory )
-        SAL_THROW(())
         : xFactory( rFactory )
         {}
 
@@ -966,7 +963,6 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleFactory(
     ComponentInstantiation pCreateFunction,
     const Sequence< OUString > & rServiceNames,
     rtl_ModuleCount * )
-    SAL_THROW(())
 {
     return new OFactoryComponentHelper(
         rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, false );
@@ -976,7 +972,6 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleFactory(
 Reference<XSingleServiceFactory > SAL_CALL createFactoryProxy(
     SAL_UNUSED_PARAMETER const Reference<XMultiServiceFactory > &,
     const Reference<XSingleServiceFactory > & rFactory )
-    SAL_THROW(())
 {
     return new OFactoryProxyHelper( rFactory );
 }
@@ -988,7 +983,6 @@ Reference<XSingleServiceFactory > SAL_CALL createOneInstanceFactory(
     ComponentInstantiation pCreateFunction,
     const Sequence< OUString > & rServiceNames,
     rtl_ModuleCount * )
-    SAL_THROW(())
 {
     return new OFactoryComponentHelper(
         rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, true );
@@ -999,7 +993,6 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleRegistryFactory(
     const Reference<XMultiServiceFactory > & rServiceManager,
     const OUString & rImplementationName,
     const Reference<XRegistryKey > & rImplementationKey )
-    SAL_THROW(())
 {
     return new ORegistryFactoryHelper(
         rServiceManager, rImplementationName, rImplementationKey, false );
@@ -1010,7 +1003,6 @@ Reference<XSingleServiceFactory > SAL_CALL createOneInstanceRegistryFactory(
     const Reference<XMultiServiceFactory > & rServiceManager,
     const OUString & rImplementationName,
     const Reference<XRegistryKey > & rImplementationKey )
-    SAL_THROW(())
 {
     return new ORegistryFactoryHelper(
         rServiceManager, rImplementationName, rImplementationKey, true );
@@ -1022,7 +1014,6 @@ Reference< lang::XSingleComponentFactory > SAL_CALL createSingleComponentFactory
     OUString const & rImplementationName,
     Sequence< OUString > const & rServiceNames,
     rtl_ModuleCount *)
-    SAL_THROW(())
 {
     return new OFactoryComponentHelper(
         Reference< XMultiServiceFactory >(), rImplementationName, 0, fptr, &rServiceNames, false );
@@ -1033,7 +1024,6 @@ Reference< lang::XSingleComponentFactory > SAL_CALL createOneInstanceComponentFa
     OUString const & rImplementationName,
     Sequence< OUString > const & rServiceNames,
     rtl_ModuleCount *)
-    SAL_THROW(())
 {
     return new OFactoryComponentHelper(
         Reference< XMultiServiceFactory >(), rImplementationName, 0, fptr, &rServiceNames, true );

cppuhelper/source/implbase.cxx

@@ -41,14 +41,14 @@ namespace
 namespace cppu
 {
 
-Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(())
+Mutex & SAL_CALL getImplHelperInitMutex(void)
 {
     return theImplHelperInitMutex::get();
 }
 
 // ClassDataBase
 
-ClassDataBase::ClassDataBase() SAL_THROW(())
+ClassDataBase::ClassDataBase()
     : bOffsetsInit( sal_False )
     , nType2Offset( 0 )
     , nClassCode( 0 )
@@ -57,7 +57,7 @@ ClassDataBase::ClassDataBase() SAL_THROW(())
 {
 }
 
-ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW(())
+ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ )
     : bOffsetsInit( sal_False )
     , nType2Offset( 0 )
     , nClassCode( nClassCode_ )
@@ -66,7 +66,7 @@ ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW(())
 {
 }
 
-ClassDataBase::~ClassDataBase() SAL_THROW(())
+ClassDataBase::~ClassDataBase()
 {
     delete pTypes;
     delete pId;
@@ -80,7 +80,7 @@ ClassDataBase::~ClassDataBase() SAL_THROW(())
 
 // ClassData
 
-void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THROW(())
+void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset )
 {
     arType2Offset[nType2Offset].nOffset = nOffset;
 
@@ -100,7 +100,7 @@ void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THR
 #endif
 }
 
-void ClassData::initTypeProvider() SAL_THROW(())
+void ClassData::initTypeProvider()
 {
     ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
     if (! pTypes)
@@ -137,14 +137,14 @@ void ClassData::initTypeProvider() SAL_THROW(())
     }
 }
 
-Sequence< Type > ClassData::getTypes() SAL_THROW(())
+Sequence< Type > ClassData::getTypes()
 {
     if (! pTypes)
         initTypeProvider();
     return *pTypes;
 }
 
-Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW(())
+Sequence< sal_Int8 > ClassData::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -152,14 +152,13 @@ Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW(())
 
 static inline bool td_equals(
     typelib_TypeDescription * pTD, typelib_TypeDescriptionReference * pType )
-    SAL_THROW(())
 {
     return (pTD->pWeakRef == pType ||
             (pTD->pTypeName->length == pType->pTypeName->length &&
              rtl_ustr_compare( pTD->pTypeName->buffer, pType->pTypeName->buffer ) == 0));
 }
 
-Any ClassData::query( const Type & rType, lang::XTypeProvider * pBase ) SAL_THROW(())
+Any ClassData::query( const Type & rType, lang::XTypeProvider * pBase )
 {
     if (rType == ::getCppuType( (const Reference< XInterface > *)0 ))
         return Any( &pBase, ::getCppuType( (const Reference< XInterface > *)0 ) );
@@ -191,13 +190,11 @@ Any ClassData::query( const Type & rType, lang::XTypeProvider * pBase ) SAL_THRO
 // WeakComponentImplHelperBase
 
 WeakComponentImplHelperBase::WeakComponentImplHelperBase( Mutex & rMutex )
-    SAL_THROW(())
     : rBHelper( rMutex )
 {
 }
 
 WeakComponentImplHelperBase::~WeakComponentImplHelperBase()
-    SAL_THROW(())
 {
 }
 
@@ -316,13 +313,11 @@ void WeakComponentImplHelperBase::removeEventListener(
 // WeakAggComponentImplHelperBase
 
 WeakAggComponentImplHelperBase::WeakAggComponentImplHelperBase( Mutex & rMutex )
-    SAL_THROW(())
     : rBHelper( rMutex )
 {
 }
 
 WeakAggComponentImplHelperBase::~WeakAggComponentImplHelperBase()
-    SAL_THROW(())
 {
 }
 

cppuhelper/source/implbase_ex.cxx

@@ -43,11 +43,10 @@ namespace cppu
 /** Shared mutex for implementation helper initialization.
     Not for public use.
 */
-::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(());
+::osl::Mutex & SAL_CALL getImplHelperInitMutex(void);
 
 
 static inline void checkInterface( Type const & rType )
-    SAL_THROW( (RuntimeException) )
 {
     if (TypeClass_INTERFACE != rType.getTypeClass())
     {
@@ -57,12 +56,12 @@ static inline void checkInterface( Type const & rType )
     }
 }
 
-static inline bool isXInterface( rtl_uString * pStr ) SAL_THROW(())
+static inline bool isXInterface( rtl_uString * pStr )
 {
     return (*((OUString const *)&pStr) == "com.sun.star.uno.XInterface");
 }
 
-static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW(())
+static inline void * makeInterface( sal_IntPtr nOffset, void * that )
 {
     return (((char *)that) + nOffset);
 }
@@ -70,14 +69,12 @@ static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW(
 static inline bool __td_equals(
     typelib_TypeDescriptionReference const * pTDR1,
     typelib_TypeDescriptionReference const * pTDR2 )
-    SAL_THROW(())
 {
     return ((pTDR1 == pTDR2) ||
             ((OUString const *)&pTDR1->pTypeName)->equals( *(OUString const *)&pTDR2->pTypeName ));
 }
 
 static inline type_entry * __getTypeEntries( class_data * cd )
-    SAL_THROW( (RuntimeException) )
 {
     type_entry * pEntries = cd->m_typeEntries;
     if (! cd->m_storedTypeRefs) // not inited?
@@ -108,7 +105,6 @@ static inline type_entry * __getTypeEntries( class_data * cd )
 }
 
 static inline void __fillTypes( Type * types, class_data * cd )
-    SAL_THROW( (RuntimeException) )
 {
     type_entry * pEntries = __getTypeEntries( cd );
     for ( sal_Int32 n = cd->m_nTypes; n--; )
@@ -161,7 +157,6 @@ bool recursivelyFindType(
 
 static inline void * __queryDeepNoXInterface(
     typelib_TypeDescriptionReference * pDemandedTDR, class_data * cd, void * that )
-    SAL_THROW( (RuntimeException) )
 {
     type_entry * pEntries = __getTypeEntries( cd );
     sal_Int32 nTypes = cd->m_nTypes;
@@ -212,7 +207,6 @@ static inline void * __queryDeepNoXInterface(
 
 Any SAL_CALL ImplHelper_query(
     Type const & rType, class_data * cd, void * that )
-    SAL_THROW( (RuntimeException) )
 {
     checkInterface( rType );
     typelib_TypeDescriptionReference * pTDR = rType.getTypeLibType();
@@ -237,7 +231,6 @@ Any SAL_CALL ImplHelper_query(
 
 Any SAL_CALL ImplHelper_queryNoXInterface(
     Type const & rType, class_data * cd, void * that )
-    SAL_THROW( (RuntimeException) )
 {
     checkInterface( rType );
     typelib_TypeDescriptionReference * pTDR = rType.getTypeLibType();
@@ -254,14 +247,13 @@ Any SAL_CALL ImplHelper_queryNoXInterface(
 }
 
 css::uno::Sequence<sal_Int8> ImplHelper_getImplementationId(
-    SAL_UNUSED_PARAMETER class_data *) SAL_THROW((css::uno::RuntimeException))
+    SAL_UNUSED_PARAMETER class_data *)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 Sequence< Type > SAL_CALL ImplHelper_getTypes(
     class_data * cd )
-    SAL_THROW( (RuntimeException) )
 {
     Sequence< Type > types( cd->m_nTypes );
     Type * pTypes = types.getArray();
@@ -271,7 +263,6 @@ Sequence< Type > SAL_CALL ImplHelper_getTypes(
 
 Sequence< Type >  SAL_CALL ImplInhHelper_getTypes(
     class_data * cd, Sequence< Type > const & rAddTypes )
-    SAL_THROW( (RuntimeException) )
 {
     sal_Int32 nImplTypes = cd->m_nTypes;
     sal_Int32 nAddTypes = rAddTypes.getLength();
@@ -291,7 +282,6 @@ Sequence< Type >  SAL_CALL ImplInhHelper_getTypes(
 
 Any SAL_CALL WeakImplHelper_query(
     Type const & rType, class_data * cd, void * that, OWeakObject * pBase )
-    SAL_THROW( (RuntimeException) )
 {
     checkInterface( rType );
     typelib_TypeDescriptionReference * pTDR = rType.getTypeLibType();
@@ -310,7 +300,6 @@ Any SAL_CALL WeakImplHelper_query(
 
 Sequence< Type > SAL_CALL WeakImplHelper_getTypes(
     class_data * cd )
-    SAL_THROW( (RuntimeException) )
 {
     sal_Int32 nTypes = cd->m_nTypes;
     Sequence< Type > types( nTypes +1 );
@@ -324,7 +313,6 @@ Sequence< Type > SAL_CALL WeakImplHelper_getTypes(
 
 Any SAL_CALL WeakAggImplHelper_queryAgg(
     Type const & rType, class_data * cd, void * that, OWeakAggObject * pBase )
-    SAL_THROW( (RuntimeException) )
 {
     checkInterface( rType );
     typelib_TypeDescriptionReference * pTDR = rType.getTypeLibType();
@@ -343,7 +331,6 @@ Any SAL_CALL WeakAggImplHelper_queryAgg(
 
 Sequence< Type > SAL_CALL WeakAggImplHelper_getTypes(
     class_data * cd )
-    SAL_THROW( (RuntimeException) )
 {
     sal_Int32 nTypes = cd->m_nTypes;
     Sequence< Type > types( nTypes +2 );
@@ -358,7 +345,6 @@ Sequence< Type > SAL_CALL WeakAggImplHelper_getTypes(
 
 Any SAL_CALL WeakComponentImplHelper_query(
     Type const & rType, class_data * cd, void * that, WeakComponentImplHelperBase * pBase )
-    SAL_THROW( (RuntimeException) )
 {
     checkInterface( rType );
     typelib_TypeDescriptionReference * pTDR = rType.getTypeLibType();
@@ -377,7 +363,6 @@ Any SAL_CALL WeakComponentImplHelper_query(
 
 Sequence< Type > SAL_CALL WeakComponentImplHelper_getTypes(
     class_data * cd )
-    SAL_THROW( (RuntimeException) )
 {
     sal_Int32 nTypes = cd->m_nTypes;
     Sequence< Type > types( nTypes +2 );
@@ -392,7 +377,6 @@ Sequence< Type > SAL_CALL WeakComponentImplHelper_getTypes(
 
 Any SAL_CALL WeakAggComponentImplHelper_queryAgg(
     Type const & rType, class_data * cd, void * that, WeakAggComponentImplHelperBase * pBase )
-    SAL_THROW( (RuntimeException) )
 {
     checkInterface( rType );
     typelib_TypeDescriptionReference * pTDR = rType.getTypeLibType();
@@ -411,7 +395,6 @@ Any SAL_CALL WeakAggComponentImplHelper_queryAgg(
 
 Sequence< Type > SAL_CALL WeakAggComponentImplHelper_getTypes(
     class_data * cd )
-    SAL_THROW( (RuntimeException) )
 {
     sal_Int32 nTypes = cd->m_nTypes;
     Sequence< Type > types( nTypes +3 );

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 &