cppuhelper: remove SAL_THROW macro

Change-Id: I54141071396d04e7bead56da14a665b8556ba6d2

20 files changed, 89 insertions, 179 deletions

diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index b5122268b471..0d6c36bbff91 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/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));
 }
diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx
index 8be3101ff3e5..b129c1aec160 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/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,
diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx
index b06f4407afcf..2141f8b763eb 100644
--- a/cppuhelper/source/compat.cxx
+++ b/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
 }
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 1b1e4522bf37..361dba0957e1 100644
--- a/cppuhelper/source/component.cxx
+++ b/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()
 {
 }
 
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index b211bd75a0ee..dc8944af5b79 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/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);
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index 882862b0d992..8e877542e918 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/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());
 }
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index b4b21f8059b5..0b54a7895827 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/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)
     {
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 4c76251864af..ef80fb866a3b 100644
--- a/cppuhelper/source/factory.cxx
+++ b/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 );
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index 97d240aa5d78..adfab032a2a5 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/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(())
 {
 }
 
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index 57359a37a7d7..0841603c6163 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/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 );
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)
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 65bff1004b8b..857e62d02dad 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -49,7 +49,7 @@ using rtl::OUString;
 namespace cppu
 {
 
-Bootstrap const & get_unorc() SAL_THROW(())
+Bootstrap const & get_unorc()
 {
     static rtlBootstrapHandle s_bstrap = 0;
     if (! s_bstrap)
@@ -126,11 +126,10 @@ protected:
     virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
 public:
-    inline Bootstrap_MacroExpander() SAL_THROW(())
+    inline Bootstrap_MacroExpander()
         : t_uno_impl( m_mutex )
         {}
-    virtual ~Bootstrap_MacroExpander()
-        SAL_THROW(());
+    virtual ~Bootstrap_MacroExpander();
 
     // XMacroExpander impl
     virtual OUString SAL_CALL expandMacros( OUString const & exp )
@@ -148,7 +147,7 @@ public:
 void Bootstrap_MacroExpander::disposing()
 {}
 
-Bootstrap_MacroExpander::~Bootstrap_MacroExpander() SAL_THROW(())
+Bootstrap_MacroExpander::~Bootstrap_MacroExpander()
 {}
 
 // XServiceInfo impl
@@ -182,7 +181,6 @@ OUString Bootstrap_MacroExpander::expandMacros( OUString const & exp )
 
 Reference< XInterface > SAL_CALL service_create(
     SAL_UNUSED_PARAMETER Reference< XComponentContext > const & )
-    SAL_THROW( (RuntimeException) )
 {
     return static_cast< ::cppu::OWeakObject * >( new Bootstrap_MacroExpander );
 }
@@ -191,7 +189,7 @@ Reference< XInterface > SAL_CALL service_create(
 
 namespace cppuhelper { namespace detail {
 
-Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_factory() SAL_THROW(())
+Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_factory()
 {
     Reference< lang::XSingleComponentFactory > free(::cppu::createSingleComponentFactory(
                                                         service_create,
diff --git a/cppuhelper/source/macro_expander.hxx b/cppuhelper/source/macro_expander.hxx
index 83ceddb00066..be56d7524b49 100644
--- a/cppuhelper/source/macro_expander.hxx
+++ b/cppuhelper/source/macro_expander.hxx
@@ -52,7 +52,7 @@ namespace detail {
 ::rtl::OUString expandMacros(rtl::OUString const & text);
 
 com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
-create_bootstrap_macro_expander_factory() SAL_THROW(());
+create_bootstrap_macro_expander_factory();
 
 }
 
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 53f3aebd81b7..903b222224b4 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -41,15 +41,15 @@ IPropertyArrayHelper::~IPropertyArrayHelper()
 {
 }
 
-inline const ::com::sun::star::uno::Type & getPropertyTypeIdentifier( ) SAL_THROW(())
+inline const ::com::sun::star::uno::Type & getPropertyTypeIdentifier( )
 {
     return ::getCppuType( (Reference< XPropertyChangeListener > *)0 );
 }
-inline const ::com::sun::star::uno::Type & getPropertiesTypeIdentifier() SAL_THROW(())
+inline const ::com::sun::star::uno::Type & getPropertiesTypeIdentifier()
 {
     return ::getCppuType( (Reference< XPropertiesChangeListener > *)0 );
 }
-inline const ::com::sun::star::uno::Type & getVetoableTypeIdentifier() SAL_THROW(())
+inline const ::com::sun::star::uno::Type & getVetoableTypeIdentifier()
 {
     return ::getCppuType( (Reference< XVetoableChangeListener > *)0 );
 }
@@ -74,7 +74,7 @@ class OPropertySetHelperInfo_Impl
     Sequence < Property > aInfos;
 
 public:
-    OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW(());
+    OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ );
 
     // XPropertySetInfo-methods
     virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -88,7 +88,6 @@ public:
  */
 OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl(
     IPropertyArrayHelper & rHelper_ )
-    SAL_THROW(())
     :aInfos( rHelper_.getProperties() )
 {
 }
@@ -97,7 +96,6 @@ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl(
  * Return the sequence of properties, which are provided throug the constructor.
  */
 Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception)
-
 {
     return aInfos;
 }
@@ -159,7 +157,7 @@ public:
 //  class PropertySetHelper
 
 OPropertySetHelper::OPropertySetHelper(
-    OBroadcastHelper  & rBHelper_ ) SAL_THROW(())
+    OBroadcastHelper  & rBHelper_ )
     : rBHelper( rBHelper_ ),
       aBoundLC( rBHelper_.rMutex ),
       aVetoableLC( rBHelper_.rMutex ),
@@ -198,10 +196,10 @@ OPropertySetHelper2::OPropertySetHelper2(
 /**
  * You must call disposing before.
  */
-OPropertySetHelper::~OPropertySetHelper() SAL_THROW(())
+OPropertySetHelper::~OPropertySetHelper()
 {
 }
-OPropertySetHelper2::~OPropertySetHelper2() SAL_THROW(())
+OPropertySetHelper2::~OPropertySetHelper2()
 {
 }
 
@@ -241,7 +239,7 @@ Any OPropertySetHelper2::queryInterface( const ::com::sun::star::uno::Type & rTy
 }
 
 // ComponentHelper
-void OPropertySetHelper::disposing() SAL_THROW(())
+void OPropertySetHelper::disposing()
 {
     // Create an event with this as sender
     Reference < XPropertySet  > rSource( (static_cast< XPropertySet *  >(this)) , UNO_QUERY );
@@ -255,7 +253,7 @@ void OPropertySetHelper::disposing() SAL_THROW(())
 }
 
 Reference < XPropertySetInfo > OPropertySetHelper::createPropertySetInfo(
-    IPropertyArrayHelper & rProperties ) SAL_THROW(())
+    IPropertyArrayHelper & rProperties )
 {
     return static_cast< XPropertySetInfo * >( new OPropertySetHelperInfo_Impl( rProperties ) );
 }
@@ -837,7 +835,6 @@ void OPropertySetHelper::setFastPropertyValues(
     sal_Int32 * pHandles,
     const Any * pValues,
     sal_Int32 nHitCount )
-    SAL_THROW( (::com::sun::star::uno::Exception) )
 {
     OSL_ENSURE( !rBHelper.bInDispose, "do not getFastPropertyValue in the dispose call" );
     OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
@@ -1046,7 +1043,7 @@ static int compare_Property_Impl( const void *arg1, const void *arg2 )
 
 }
 
-void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW(())
+void OPropertyArrayHelper::init( sal_Bool bSorted )
 {
     sal_Int32 i, nElements = aInfos.getLength();
     const Property* pProperties = aInfos.getConstArray();
@@ -1077,7 +1074,6 @@ OPropertyArrayHelper::OPropertyArrayHelper(
     Property * pProps,
     sal_Int32 nEle,
     sal_Bool bSorted )
-    SAL_THROW(())
     : m_pReserved(NULL)
     , aInfos(pProps, nEle)
     , bRightOrdered( sal_False )
@@ -1088,7 +1084,6 @@ OPropertyArrayHelper::OPropertyArrayHelper(
 OPropertyArrayHelper::OPropertyArrayHelper(
     const Sequence< Property > & aProps,
     sal_Bool bSorted )
-    SAL_THROW(())
     : m_pReserved(NULL)
     , aInfos(aProps)
     , bRightOrdered( sal_False )
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 65d0e5654f3e..baa9428f8e00 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -280,7 +280,6 @@ css::uno::Reference<css::uno::XInterface> cppu::loadSharedLibComponentFactory(
     rtl::OUString const & rImplName,
     css::uno::Reference<css::lang::XMultiServiceFactory> const & xMgr,
     css::uno::Reference<css::registry::XRegistryKey> const & xKey)
-    SAL_THROW((css::loader::CannotActivateFactoryException))
 {
     assert(rPath.isEmpty()); (void) rPath;
     assert(!xKey.is()); (void) xKey;
@@ -308,7 +307,6 @@ void cppu::writeSharedLibComponentInfo(
     rtl::OUString const & uri, rtl::OUString const & rPath,
     css::uno::Reference<css::lang::XMultiServiceFactory> const & xMgr,
     css::uno::Reference<css::registry::XRegistryKey> const & xKey)
-    SAL_THROW((css::registry::CannotRegisterImplementationException))
 {
     assert(rPath.isEmpty()); (void) rPath;
     osl::Module mod(uri, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL);
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index e318ceb3b64a..e25325a2a65a 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -620,7 +620,6 @@ class EventListenerImpl
 public:
     inline EventListenerImpl(
         Reference< container::XHierarchicalNameAccess > const & xTDMgr )
-        SAL_THROW(())
         : m_xTDMgr( xTDMgr )
         {}
 
@@ -642,7 +641,6 @@ void EventListenerImpl::disposing( lang::EventObject const & rEvt )
 
 sal_Bool SAL_CALL installTypeDescriptionManager(
     Reference< container::XHierarchicalNameAccess > const & xTDMgr_c )
-    SAL_THROW(())
 {
     uno::Environment curr_env(Environment::getCurrent());
     uno::Environment target_env(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx
index 29dd5a233948..b20ec1bd9072 100644
--- a/cppuhelper/source/typeprovider.cxx
+++ b/cppuhelper/source/typeprovider.cxx
@@ -28,12 +28,12 @@ namespace cppu
 {
 
 
-OImplementationId::~OImplementationId() SAL_THROW(())
+OImplementationId::~OImplementationId()
 {
     delete _pSeq;
 }
 
-Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW(())
+Sequence< sal_Int8 > OImplementationId::getImplementationId() const
 {
     if (! _pSeq)
     {
@@ -50,7 +50,6 @@ Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW(()
 
 
 static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSource, sal_Int32 nOffset )
-    SAL_THROW(())
 {
     Type * pDest = rDest.getArray();
     const Type * pSource = rSource.getConstArray();
@@ -63,7 +62,6 @@ static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSou
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 1 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
@@ -74,7 +72,6 @@ OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 2 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
@@ -87,7 +84,6 @@ OTypeCollection::OTypeCollection(
     const Type & rType2,
     const Type & rType3,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 3 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
@@ -102,7 +98,6 @@ OTypeCollection::OTypeCollection(
     const Type & rType3,
     const Type & rType4,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 4 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
@@ -119,7 +114,6 @@ OTypeCollection::OTypeCollection(
     const Type & rType4,
     const Type & rType5,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 5 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
@@ -138,7 +132,6 @@ OTypeCollection::OTypeCollection(
     const Type & rType5,
     const Type & rType6,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 6 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
@@ -159,7 +152,6 @@ OTypeCollection::OTypeCollection(
     const Type & rType6,
     const Type & rType7,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 7 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
@@ -182,7 +174,6 @@ OTypeCollection::OTypeCollection(
     const Type & rType7,
     const Type & rType8,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 8 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
@@ -207,7 +198,6 @@ OTypeCollection::OTypeCollection(
     const Type & rType8,
     const Type & rType9,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 9 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
@@ -234,7 +224,6 @@ OTypeCollection::OTypeCollection(
     const Type & rType9,
     const Type & rType10,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 10 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
@@ -263,7 +252,6 @@ OTypeCollection::OTypeCollection(
     const Type & rType10,
     const Type & rType11,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 11 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
@@ -294,7 +282,6 @@ OTypeCollection::OTypeCollection(
     const Type & rType11,
     const Type & rType12,
     const Sequence< Type > & rAddTypes )
-    SAL_THROW(())
     : _aTypes( 12 + rAddTypes.getLength() )
 {
     _aTypes[0] = rType1;
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 0736d8ed3ae4..65018b7d75ec 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -33,7 +33,7 @@ namespace cppu
 {
 
 // due to static Reflection destruction from usr, ther must be a mutex leak (#73272#)
-inline static Mutex & getWeakMutex() SAL_THROW(())
+inline static Mutex & getWeakMutex()
 {
     static Mutex * s_pMutex = 0;
     if (! s_pMutex)
@@ -50,7 +50,7 @@ public:
     /**
         Hold the weak object without an acquire (only the pointer).
      */
-    OWeakConnectionPoint( OWeakObject* pObj ) SAL_THROW(())
+    OWeakConnectionPoint( OWeakObject* pObj )
         : m_aRefCount( 0 )
         , m_pObject(pObj)
         , m_aReferences( getWeakMutex() )
@@ -172,7 +172,7 @@ void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference
 
 #ifdef _MSC_VER
 // Accidentally occurs in msvc mapfile = > had to be outlined.
-OWeakObject::OWeakObject() SAL_THROW(())
+OWeakObject::OWeakObject()
     : m_refCount( 0 ),
       m_pWeakConnectionPoint( 0 )
 {
@@ -224,7 +224,7 @@ void OWeakObject::disposeWeakConnectionPoint()
     }
 }
 
-OWeakObject::~OWeakObject() SAL_THROW( (RuntimeException) )
+OWeakObject::~OWeakObject()
 {
 }
 
@@ -250,7 +250,7 @@ Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter()
 
 //-- OWeakAggObject ----------------------------------------------------
 
-OWeakAggObject::~OWeakAggObject() SAL_THROW( (RuntimeException) )
+OWeakAggObject::~OWeakAggObject()
 {
 }
 
@@ -319,8 +319,8 @@ namespace uno
 class OWeakRefListener: public XReference, private boost::noncopyable
 {
 public:
-    OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW(());
-    virtual ~OWeakRefListener() SAL_THROW(());
+    OWeakRefListener(const Reference< XInterface >& xInt);
+    virtual ~OWeakRefListener();
 
     // XInterface
     Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
@@ -336,7 +336,7 @@ public:
     Reference< XAdapter >       m_XWeakConnectionPoint;
 };
 
-OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW(())
+OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt)
     : m_aRefCount( 1 )
 {
     try
@@ -357,7 +357,7 @@ OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THRO
     osl_atomic_decrement( &m_aRefCount );
 }
 
-OWeakRefListener::~OWeakRefListener() SAL_THROW(())
+OWeakRefListener::~OWeakRefListener()
 {
     try
     {
@@ -410,7 +410,7 @@ void SAL_CALL OWeakRefListener::dispose()
 
 //-- WeakReferenceHelper ----------------------------------------------------------
 
-WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SAL_THROW(())
+WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt)
     : m_pImpl( 0 )
 {
     if (xInt.is())
@@ -420,7 +420,7 @@ WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SA
     }
 }
 
-WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SAL_THROW(())
+WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef)
     : m_pImpl( 0 )
 {
     Reference< XInterface > xInt( rWeakRef.get() );
@@ -431,7 +431,7 @@ WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SA
     }
 }
 
-void WeakReferenceHelper::clear() SAL_THROW(())
+void WeakReferenceHelper::clear()
 {
     try
     {
@@ -450,7 +450,7 @@ void WeakReferenceHelper::clear() SAL_THROW(())
     catch (RuntimeException &) { OSL_ASSERT( false ); } // assert here, but no unexpected()
 }
 
-WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) SAL_THROW(())
+WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef)
 {
     if (this == &rWeakRef)
     {
@@ -462,7 +462,6 @@ WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& r
 
 WeakReferenceHelper & SAL_CALL
 WeakReferenceHelper::operator= (const Reference< XInterface > & xInt)
-SAL_THROW(())
 {
     try
     {
@@ -477,12 +476,12 @@ SAL_THROW(())
     return *this;
 }
 
-WeakReferenceHelper::~WeakReferenceHelper() SAL_THROW(())
+WeakReferenceHelper::~WeakReferenceHelper()
 {
     clear();
 }
 
-Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW(())
+Reference< XInterface > WeakReferenceHelper::get() const
 {
     try
     {
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index aaa5bed2661f..7bd62c75dccb 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -80,7 +80,7 @@ class ServiceImpl0
     Reference< XComponentContext > m_xContext;
 
 public:
-    ServiceImpl0( Reference< XComponentContext > const & xContext ) SAL_THROW(());
+    ServiceImpl0( Reference< XComponentContext > const & xContext );
 
     // XInitialization
     virtual void SAL_CALL initialize( const Sequence< Any >& rArgs ) throw (Exception, RuntimeException);
@@ -91,7 +91,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException);
 };
 
-ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SAL_THROW(())
+ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext )
     : m_xContext( xContext )
 {
     sal_Int32 n;
@@ -151,7 +151,7 @@ sal_Bool ServiceImpl0::supportsService( const OUString & rServiceName )
 class ServiceImpl1 : public ServiceImpl0
 {
 public:
-    inline ServiceImpl1( Reference< XComponentContext > const & xContext ) SAL_THROW(())
+    inline ServiceImpl1( Reference< XComponentContext > const & xContext )
         : ServiceImpl0( xContext )
         {}
 
@@ -175,14 +175,12 @@ Sequence< OUString > ServiceImpl1::getSupportedServiceNames()
 
 static Reference< XInterface > SAL_CALL ServiceImpl0_create(
     Reference< XComponentContext > const & xContext )
-    SAL_THROW( (Exception) )
 {
     return (OWeakObject *)new ServiceImpl0( xContext );
 }
 
 static Reference< XInterface > SAL_CALL ServiceImpl1_create(
     Reference< XComponentContext > const & xContext )
-    SAL_THROW( (Exception) )
 {
     return (OWeakObject *)new ServiceImpl1( xContext );
 }
diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx
index 5ccd4a14050b..64d2b9ff36af 100644
--- a/cppuhelper/test/testcmp/TestComponent.cxx
+++ b/cppuhelper/test/testcmp/TestComponent.cxx
@@ -63,8 +63,7 @@ class TestComponent: public cppu::WeakImplHelper1<lang::XServiceInfo>
 public:
     static uno::Reference<uno::XInterface> create(
         uno::Reference<uno::XComponentContext> const & xCtx
-    )
-    SAL_THROW((uno::Exception));
+    );
 
 
     static uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames_Static();
@@ -89,9 +88,7 @@ protected:
 
 
 uno::Reference<uno::XInterface> SAL_CALL TestComponent::create(
-    uno::Reference<uno::XComponentContext> const & xCtx
-)
-    SAL_THROW((uno::Exception))
+    uno::Reference<uno::XComponentContext> const & xCtx)
 {
     try
     {