bridges: remove SAL_THROW macro

Change-Id: I2daafd711aedab17b6c13fde95c8af5f49d38a7c

38 files changed, 209 insertions, 220 deletions

diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 8eb1a723a236..6f436941a18a 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -31,7 +31,7 @@ namespace CPPU_CURRENT_NAMESPACE
 {
 
 
-inline void SAL_CALL cppu_cppInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy ) SAL_THROW(())
+inline void SAL_CALL cppu_cppInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy )
 {
     cppu_cppInterfaceProxy * pThis =
         static_cast< cppu_cppInterfaceProxy * >(
@@ -51,7 +51,7 @@ inline void SAL_CALL cppu_cppInterfaceProxy_free( uno_ExtEnvironment * pEnv, voi
 
 inline void SAL_CALL cppu_Mapping_uno2cpp(
     uno_Mapping * pMapping, void ** ppCppI,
-    void * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr ) SAL_THROW(())
+    void * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr )
 {
     OSL_ASSERT( ppCppI && pTypeDescr );
     if (*ppCppI)
@@ -91,7 +91,7 @@ inline void SAL_CALL cppu_Mapping_uno2cpp(
     }
 }
 
-inline void cppu_cppInterfaceProxy::acquireProxy() SAL_THROW(())
+inline void cppu_cppInterfaceProxy::acquireProxy()
 {
     if (1 == osl_atomic_increment( &nRef ))
     {
@@ -105,7 +105,7 @@ inline void cppu_cppInterfaceProxy::acquireProxy() SAL_THROW(())
     }
 }
 
-inline void cppu_cppInterfaceProxy::releaseProxy() SAL_THROW(())
+inline void cppu_cppInterfaceProxy::releaseProxy()
 {
     if (! osl_atomic_decrement( &nRef )) // last release
     {
@@ -117,7 +117,7 @@ inline void cppu_cppInterfaceProxy::releaseProxy() SAL_THROW(())
 
 inline cppu_cppInterfaceProxy::cppu_cppInterfaceProxy(
     cppu_Bridge * pBridge_, uno_Interface * pUnoI_,
-    typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ ) SAL_THROW(())
+    typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ )
     : nRef( 1 )
     , pBridge( pBridge_ )
     , pUnoI( pUnoI_ )
@@ -141,7 +141,7 @@ inline cppu_cppInterfaceProxy::cppu_cppInterfaceProxy(
 
 
 
-inline void SAL_CALL cppu_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy ) SAL_THROW(())
+inline void SAL_CALL cppu_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy )
 {
     cppu_unoInterfaceProxy * pThis =
         static_cast< cppu_unoInterfaceProxy * >(
@@ -159,7 +159,7 @@ inline void SAL_CALL cppu_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, voi
     delete pThis;
 }
 
-inline void SAL_CALL cppu_unoInterfaceProxy_acquire( uno_Interface * pUnoI ) SAL_THROW(())
+inline void SAL_CALL cppu_unoInterfaceProxy_acquire( uno_Interface * pUnoI )
 {
     if (1 == osl_atomic_increment( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef ))
     {
@@ -180,7 +180,7 @@ inline void SAL_CALL cppu_unoInterfaceProxy_acquire( uno_Interface * pUnoI ) SAL
     }
 }
 
-inline void SAL_CALL cppu_unoInterfaceProxy_release( uno_Interface * pUnoI ) SAL_THROW(())
+inline void SAL_CALL cppu_unoInterfaceProxy_release( uno_Interface * pUnoI )
 {
     if (! osl_atomic_decrement( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef ))
     {
@@ -192,7 +192,7 @@ inline void SAL_CALL cppu_unoInterfaceProxy_release( uno_Interface * pUnoI ) SAL
 
 inline void SAL_CALL cppu_Mapping_cpp2uno(
     uno_Mapping * pMapping, void ** ppUnoI,
-    void * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) SAL_THROW(())
+    void * pCppI, typelib_InterfaceTypeDescription * pTypeDescr )
 {
     OSL_ENSURE( ppUnoI && pTypeDescr, "### null ptr!" );
     if (*ppUnoI)
@@ -234,7 +234,7 @@ inline void SAL_CALL cppu_Mapping_cpp2uno(
 
 inline cppu_unoInterfaceProxy::cppu_unoInterfaceProxy(
     cppu_Bridge * pBridge_, ::com::sun::star::uno::XInterface * pCppI_,
-    typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ ) SAL_THROW(())
+    typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ )
     : nRef( 1 )
     , pBridge( pBridge_ )
     , pCppI( pCppI_ )
@@ -263,19 +263,19 @@ inline cppu_unoInterfaceProxy::cppu_unoInterfaceProxy(
 
 
 
-inline void SAL_CALL cppu_Mapping_acquire( uno_Mapping * pMapping ) SAL_THROW(())
+inline void SAL_CALL cppu_Mapping_acquire( uno_Mapping * pMapping )
 {
     static_cast< cppu_Mapping * >( pMapping )->pBridge->acquire();
 }
 
-inline void SAL_CALL cppu_Mapping_release( uno_Mapping * pMapping ) SAL_THROW(())
+inline void SAL_CALL cppu_Mapping_release( uno_Mapping * pMapping )
 {
     static_cast< cppu_Mapping * >( pMapping )->pBridge->release();
 }
 
 inline cppu_Bridge::cppu_Bridge(
     uno_ExtEnvironment * pCppEnv_, uno_ExtEnvironment * pUnoEnv_,
-    sal_Bool bExportCpp2Uno_ ) SAL_THROW(())
+    sal_Bool bExportCpp2Uno_ )
     : nRef( 1 )
     , pCppEnv( pCppEnv_ )
     , pUnoEnv( pUnoEnv_ )
@@ -295,18 +295,18 @@ inline cppu_Bridge::cppu_Bridge(
     (*((uno_Environment *)pUnoEnv)->acquire)( (uno_Environment *)pUnoEnv );
 }
 
-inline cppu_Bridge::~cppu_Bridge() SAL_THROW(())
+inline cppu_Bridge::~cppu_Bridge()
 {
     (*((uno_Environment *)pUnoEnv)->release)( (uno_Environment *)pUnoEnv );
     (*((uno_Environment *)pCppEnv)->release)( (uno_Environment *)pCppEnv );
 }
 
-inline void SAL_CALL cppu_Bridge_free( uno_Mapping * pMapping ) SAL_THROW(())
+inline void SAL_CALL cppu_Bridge_free( uno_Mapping * pMapping )
 {
     delete static_cast< cppu_Mapping * >( pMapping )->pBridge;
 }
 
-inline void cppu_Bridge::acquire() SAL_THROW(())
+inline void cppu_Bridge::acquire()
 {
     if (1 == osl_atomic_increment( &nRef ))
     {
@@ -327,7 +327,7 @@ inline void cppu_Bridge::acquire() SAL_THROW(())
     }
 }
 
-inline void cppu_Bridge::release() SAL_THROW(())
+inline void cppu_Bridge::release()
 {
     if (! osl_atomic_decrement( &nRef ))
     {
@@ -337,7 +337,7 @@ inline void cppu_Bridge::release() SAL_THROW(())
 
 
 inline void SAL_CALL cppu_ext_getMapping(
-    uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) SAL_THROW(())
+    uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
 {
     OSL_ASSERT( ppMapping && pFrom && pTo );
     if (ppMapping && pFrom && pTo && pFrom->pExtEnv && pTo->pExtEnv)
@@ -381,7 +381,7 @@ inline void SAL_CALL cppu_ext_getMapping(
 
 // environment init stuff
 
-inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
+inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart()
 {
     static OUString * s_pStaticOidPart = 0;
     if (! s_pStaticOidPart)
@@ -407,7 +407,7 @@ inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
 // functions set at environment init
 
 inline void SAL_CALL cppu_cppenv_computeObjectIdentifier(
-    uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ) SAL_THROW(())
+    uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
 {
     OSL_ENSURE( pEnv && ppOId && pInterface, "### null ptr!" );
     if (pEnv && ppOId && pInterface)
@@ -449,19 +449,19 @@ inline void SAL_CALL cppu_cppenv_computeObjectIdentifier(
     }
 }
 
-inline void SAL_CALL cppu_cppenv_acquireInterface( uno_ExtEnvironment *, void * pCppI ) SAL_THROW(())
+inline void SAL_CALL cppu_cppenv_acquireInterface( uno_ExtEnvironment *, void * pCppI )
 {
     reinterpret_cast< ::com::sun::star::uno::XInterface * >( pCppI )->acquire();
 }
 
-inline void SAL_CALL cppu_cppenv_releaseInterface( uno_ExtEnvironment *, void * pCppI ) SAL_THROW(())
+inline void SAL_CALL cppu_cppenv_releaseInterface( uno_ExtEnvironment *, void * pCppI )
 {
     reinterpret_cast< ::com::sun::star::uno::XInterface * >( pCppI )->release();
 }
 
-inline void SAL_CALL cppu_cppenv_environmentDisposing( uno_Environment * ) SAL_THROW(()) {}
+inline void SAL_CALL cppu_cppenv_environmentDisposing( uno_Environment * ) {}
 
-inline void SAL_CALL cppu_cppenv_initEnvironment( uno_Environment * pCppEnv ) SAL_THROW(())
+inline void SAL_CALL cppu_cppenv_initEnvironment( uno_Environment * pCppEnv )
 {
     OSL_ENSURE( pCppEnv->pExtEnv, "### expected extended environment!" );
     OSL_ENSURE( ::rtl_ustr_ascii_compare( pCppEnv->pTypeName->buffer, CPPU_CURRENT_LANGUAGE_BINDING_NAME ) == 0, "### wrong environment type!" );
diff --git a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
index e9f776500f10..9c59a037addb 100644
--- a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
@@ -61,12 +61,12 @@ public:
 
     static uno_Mapping * createMapping(
         uno_ExtEnvironment * pCppEnv, uno_ExtEnvironment * pUnoEnv,
-        bool bExportCpp2Uno) SAL_THROW(());
+        bool bExportCpp2Uno);
 
     // Interface for Cpp/UnoInterfaceProxy:
 
-    void acquire() SAL_THROW(());
-    void release() SAL_THROW(());
+    void acquire();
+    void release();
 
     // Interface for individual CPP--UNO bridges:
 
@@ -82,9 +82,9 @@ private:
 
     Bridge(
         uno_ExtEnvironment * pCppEnv_, uno_ExtEnvironment * pUnoEnv_,
-        bool bExportCpp2Uno_) SAL_THROW(());
+        bool bExportCpp2Uno_);
 
-    ~Bridge() SAL_THROW(());
+    ~Bridge();
 
     struct Mapping: public uno_Mapping {
         Bridge * pBridge;
diff --git a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
index 13330619c257..b9290f91c441 100644
--- a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
@@ -50,7 +50,7 @@ public:
     static com::sun::star::uno::XInterface * create(
         Bridge * pBridge, uno_Interface * pUnoI,
         typelib_InterfaceTypeDescription * pTypeDescr,
-        OUString const & rOId) SAL_THROW(());
+        OUString const & rOId);
 
     // Interface for individual CPP--UNO bridges:
 
@@ -60,8 +60,8 @@ public:
     OUString getOid() { return oid; }
 
     // non virtual methods called on incoming vtable calls #1, #2
-    void acquireProxy() SAL_THROW(());
-    void releaseProxy() SAL_THROW(());
+    void acquireProxy();
+    void releaseProxy();
 
     static CppInterfaceProxy * castInterfaceToProxy(void * pInterface);
 
@@ -72,7 +72,7 @@ private:
     CppInterfaceProxy(
         Bridge * pBridge_, uno_Interface * pUnoI_,
         typelib_InterfaceTypeDescription * pTypeDescr_,
-        OUString const & rOId_) SAL_THROW(());
+        OUString const & rOId_);
 
     ~CppInterfaceProxy();
 
diff --git a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
index cb9fceeb64af..03701c5a9e3c 100644
--- a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
@@ -65,7 +65,7 @@ public:
     static UnoInterfaceProxy * create(
         Bridge * pBridge, com::sun::star::uno::XInterface * pCppI,
         typelib_InterfaceTypeDescription * pTypeDescr,
-        OUString const & rOId) SAL_THROW(());
+        OUString const & rOId);
 
     // Interface for individual CPP--UNO bridges:
 
@@ -79,7 +79,7 @@ private:
     UnoInterfaceProxy(
         Bridge * pBridge_, com::sun::star::uno::XInterface * pCppI_,
         typelib_InterfaceTypeDescription * pTypeDescr_,
-        OUString const & rOId_) SAL_THROW(());
+        OUString const & rOId_);
 
     ~UnoInterfaceProxy();
 
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index 39becc7d8a72..19d494191c89 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -51,7 +51,7 @@ void dummy_can_throw_anything( char const * )
 }
 
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #ifdef DEBUG
     char const * start = p;
@@ -100,24 +100,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 875baa346867..aa9cf6cb4e98 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -124,7 +124,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
     // example: N3com3sun4star4lang24IllegalArgumentExceptionE
 
@@ -163,13 +163,13 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    std::type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    std::type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
     // Insert commonly needed type_infos to avoid dlsym() calls
@@ -189,12 +189,12 @@ RTTI::RTTI() SAL_THROW(())
                                             (std::type_info*) &typeid( com::sun::star::ucb::NameClashException ) ) );
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
-std::type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+std::type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     std::type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index daf6daf57a7f..6a909766e9ee 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -50,7 +50,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -98,24 +98,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index a7234c2968d8..0516d6fdc2cb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -51,7 +51,7 @@ namespace CPPU_CURRENT_NAMESPACE
     {
     }
 
-    static OUString toUNOname( char const * p ) SAL_THROW(())
+    static OUString toUNOname( char const * p )
     {
 #if OSL_DEBUG_LEVEL > 1
         char const * start = p;
@@ -101,20 +101,20 @@ namespace CPPU_CURRENT_NAMESPACE
 #endif
 
     public:
-        RTTI() SAL_THROW(());
-        ~RTTI() SAL_THROW(());
+        RTTI();
+        ~RTTI();
 
-        type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW(());
+        type_info * getRTTI(typelib_CompoundTypeDescription *);
     };
 
-    RTTI::RTTI() SAL_THROW(())
+    RTTI::RTTI()
 #ifndef ANDROID
         : m_hApp( dlopen( 0, RTLD_LAZY ) )
 #endif
     {
     }
 
-    RTTI::~RTTI() SAL_THROW(())
+    RTTI::~RTTI()
     {
 #ifndef ANDROID
         dlclose( m_hApp );
@@ -122,7 +122,7 @@ namespace CPPU_CURRENT_NAMESPACE
     }
 
 
-    type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+    type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
     {
         type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 73d0b7132f05..6946e49d885d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -51,7 +51,7 @@ namespace CPPU_CURRENT_NAMESPACE
     {
     }
 
-    static OUString toUNOname( char const * p ) SAL_THROW(())
+    static OUString toUNOname( char const * p )
     {
 #if OSL_DEBUG_LEVEL > 1
         char const * start = p;
@@ -99,24 +99,24 @@ namespace CPPU_CURRENT_NAMESPACE
         void * m_hApp;
 
     public:
-        RTTI() SAL_THROW(());
-        ~RTTI() SAL_THROW(());
+        RTTI();
+        ~RTTI();
 
-        type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW(());
+        type_info * getRTTI(typelib_CompoundTypeDescription *);
     };
 
-    RTTI::RTTI() SAL_THROW(())
+    RTTI::RTTI()
         : m_hApp( dlopen( 0, RTLD_LAZY ) )
     {
     }
 
-    RTTI::~RTTI() SAL_THROW(())
+    RTTI::~RTTI()
     {
         dlclose( m_hApp );
     }
 
 
-    type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+    type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
     {
         type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
index daf6daf57a7f..6a909766e9ee 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -50,7 +50,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -98,24 +98,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 165704d1b441..b2cffb782cdb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -47,7 +47,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -95,13 +95,13 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
 #if defined(FREEBSD) && __FreeBSD_version < 702104
     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 #else
@@ -110,13 +110,13 @@ RTTI::RTTI() SAL_THROW(())
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 289a0200bb9e..ed04e8bfdd5f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -51,7 +51,7 @@ namespace CPPU_CURRENT_NAMESPACE
     {
     }
 
-    static OUString toUNOname( char const * p ) SAL_THROW(())
+    static OUString toUNOname( char const * p )
     {
 #if OSL_DEBUG_LEVEL > 1
         char const * start = p;
@@ -99,24 +99,24 @@ namespace CPPU_CURRENT_NAMESPACE
         void * m_hApp;
 
     public:
-        RTTI() SAL_THROW(());
-        ~RTTI() SAL_THROW(());
+        RTTI();
+        ~RTTI();
 
-        type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW(());
+        type_info * getRTTI(typelib_CompoundTypeDescription *);
     };
 
-    RTTI::RTTI() SAL_THROW(())
+    RTTI::RTTI()
         : m_hApp( dlopen( 0, RTLD_LAZY ) )
     {
     }
 
-    RTTI::~RTTI() SAL_THROW(())
+    RTTI::~RTTI()
     {
         dlclose( m_hApp );
     }
 
 
-    type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+    type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
     {
         type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 0a6a211f272e..c13c8accddf7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -48,7 +48,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if defined BRIDGES_DEBUG
     char const * start = p;
@@ -96,24 +96,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
index e9d6c33f7681..2771c323691d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -50,7 +50,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -98,24 +98,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
index daf6daf57a7f..6a909766e9ee 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -50,7 +50,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -98,24 +98,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
index daf6daf57a7f..6a909766e9ee 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -50,7 +50,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -98,24 +98,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
index daf6daf57a7f..6a909766e9ee 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -50,7 +50,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -98,24 +98,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 78ff54f706b6..345753858ef9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -49,7 +49,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if defined BRIDGES_DEBUG
     char const * start = p;
@@ -97,24 +97,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 58c4ac156584..49aceedc389b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -402,7 +402,7 @@ const int codeSnippetSize = 24;
 // unwinding info.
 unsigned char * codeSnippet( unsigned char * code,
         sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
-        bool bHasHiddenParam ) SAL_THROW(())
+        bool bHasHiddenParam )
 {
     sal_uInt64 nOffsetAndIndex = ( ( (sal_uInt64) nVtableOffset ) << 32 ) | ( (sal_uInt64) nFunctionIndex );
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index c2f1a146f3de..64386b391d53 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -49,7 +49,7 @@ using namespace ::__cxxabiv1;
 namespace CPPU_CURRENT_NAMESPACE
 {
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -97,13 +97,13 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
 #if defined(FREEBSD) && __FreeBSD_version < 702104
     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 #else
@@ -112,13 +112,13 @@ RTTI::RTTI() SAL_THROW(())
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index 2368541c654e..adbddd7cf1cb 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -121,7 +121,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -169,24 +169,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    std::type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    std::type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-std::type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+std::type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     std::type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
index 2283ba40d251..585161f3378a 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
@@ -49,7 +49,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -97,24 +97,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index 86089c3ce5a1..ac6be9f8fe7f 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -400,7 +400,7 @@ const int codeSnippetSize = 24;
 // unwinding info.
 unsigned char * codeSnippet( unsigned char * code,
         sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
-        bool bHasHiddenParam ) SAL_THROW(())
+        bool bHasHiddenParam )
 {
     sal_uInt64 nOffsetAndIndex = ( ( (sal_uInt64) nVtableOffset ) << 32 ) | ( (sal_uInt64) nFunctionIndex );
 
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 8ba8688b6d0f..83b06c5161f3 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -131,7 +131,7 @@ void dummy_can_throw_anything( char const * )
 #pragma GCC diagnostic pop
 #endif
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -179,24 +179,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    std::type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    std::type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-std::type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+std::type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     std::type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 71502dbc3d7d..c1811970d778 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -51,7 +51,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -99,24 +99,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index 16e13c9b3182..eec8d958a33d 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -48,7 +48,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if defined BRIDGES_DEBUG
     char const * start = p;
@@ -96,24 +96,24 @@ class RTTI
     void * m_hApp;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
     dlclose( m_hApp );
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx
index ea75423f5167..bf1c0c03ea1e 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -55,7 +55,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -101,22 +101,22 @@ class RTTI
     t_rtti_map m_generatedRttis;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
index bd6b0079aa4b..ee89e4f305a3 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
@@ -400,7 +400,7 @@ const int codeSnippetSize = 24;
 // unwinding info.
 unsigned char * codeSnippet( unsigned char * code,
         sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
-        bool bHasHiddenParam ) SAL_THROW(())
+        bool bHasHiddenParam )
 {
     sal_uInt64 nOffsetAndIndex = ( ( (sal_uInt64) nVtableOffset ) << 32 ) | ( (sal_uInt64) nFunctionIndex );
 
diff --git a/bridges/source/cpp_uno/mingw_x86-64/except.cxx b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
index ea75423f5167..bf1c0c03ea1e 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
@@ -55,7 +55,7 @@ void dummy_can_throw_anything( char const * )
 {
 }
 
-static OUString toUNOname( char const * p ) SAL_THROW(())
+static OUString toUNOname( char const * p )
 {
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
@@ -101,22 +101,22 @@ class RTTI
     t_rtti_map m_generatedRttis;
 
 public:
-    RTTI() SAL_THROW(());
-    ~RTTI() SAL_THROW(());
+    RTTI();
+    ~RTTI();
 
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
+    type_info * getRTTI( typelib_CompoundTypeDescription * );
 };
 
-RTTI::RTTI() SAL_THROW(())
+RTTI::RTTI()
 {
 }
 
-RTTI::~RTTI() SAL_THROW(())
+RTTI::~RTTI()
 {
 }
 
 
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
 {
     type_info * rtti;
 
diff --git a/bridges/source/cpp_uno/shared/bridge.cxx b/bridges/source/cpp_uno/shared/bridge.cxx
index 964899325611..927e278f3397 100644
--- a/bridges/source/cpp_uno/shared/bridge.cxx
+++ b/bridges/source/cpp_uno/shared/bridge.cxx
@@ -143,13 +143,13 @@ void uno2cppMapping(
 
 uno_Mapping * Bridge::createMapping(
     uno_ExtEnvironment * pCppEnv, uno_ExtEnvironment * pUnoEnv,
-    bool bExportCpp2Uno) SAL_THROW(())
+    bool bExportCpp2Uno)
 {
     Bridge * bridge = new Bridge(pCppEnv, pUnoEnv, bExportCpp2Uno);
     return bExportCpp2Uno ? &bridge->aCpp2Uno : &bridge->aUno2Cpp;
 }
 
-void Bridge::acquire() SAL_THROW(())
+void Bridge::acquire()
 {
     if (1 == osl_atomic_increment( &nRef ))
     {
@@ -170,7 +170,7 @@ void Bridge::acquire() SAL_THROW(())
     }
 }
 
-void Bridge::release() SAL_THROW(())
+void Bridge::release()
 {
     if (! osl_atomic_decrement( &nRef ))
     {
@@ -180,7 +180,7 @@ void Bridge::release() SAL_THROW(())
 
 Bridge::Bridge(
     uno_ExtEnvironment * pCppEnv_, uno_ExtEnvironment * pUnoEnv_,
-    bool bExportCpp2Uno_) SAL_THROW(())
+    bool bExportCpp2Uno_)
     : nRef( 1 )
     , pCppEnv( pCppEnv_ )
     , pUnoEnv( pUnoEnv_ )
@@ -200,7 +200,7 @@ Bridge::Bridge(
     (*((uno_Environment *)pUnoEnv)->acquire)( (uno_Environment *)pUnoEnv );
 }
 
-Bridge::~Bridge() SAL_THROW(())
+Bridge::~Bridge()
 {
     (*((uno_Environment *)pUnoEnv)->release)( (uno_Environment *)pUnoEnv );
     (*((uno_Environment *)pCppEnv)->release)( (uno_Environment *)pCppEnv );
diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx
index c95f351f5311..d157b0fda12c 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -45,7 +45,7 @@ namespace {
 static OUString * s_pStaticOidPart = 0;
 #endif
 
-const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
+const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart()
 {
 #if ! (defined(__GNUC__) && defined(__APPLE__))
     static OUString * s_pStaticOidPart = 0;
@@ -81,7 +81,6 @@ const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
 extern "C" {
 
 static void s_stub_computeObjectIdentifier(va_list * pParam)
-    SAL_THROW(())
 {
     uno_ExtEnvironment  * pEnv       = va_arg(*pParam, uno_ExtEnvironment *);
     rtl_uString        ** ppOId      = va_arg(*pParam, rtl_uString **);
@@ -136,13 +135,11 @@ static void s_stub_computeObjectIdentifier(va_list * pParam)
 
 static void SAL_CALL computeObjectIdentifier(
     uno_ExtEnvironment * pExtEnv, rtl_uString ** ppOId, void * pInterface )
-    SAL_THROW(())
 {
     uno_Environment_invoke(&pExtEnv->aBase, s_stub_computeObjectIdentifier, pExtEnv, ppOId, pInterface);
 }
 
 static void s_stub_acquireInterface(va_list * pParam)
-    SAL_THROW(())
 {
     /*uno_ExtEnvironment * pExtEnv = */va_arg(*pParam, uno_ExtEnvironment *);
     void               * pCppI   = va_arg(*pParam, void *);
@@ -151,13 +148,11 @@ static void s_stub_acquireInterface(va_list * pParam)
 }
 
 static void SAL_CALL acquireInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
-    SAL_THROW(())
 {
     uno_Environment_invoke(&pExtEnv->aBase, s_stub_acquireInterface, pExtEnv, pCppI);
 }
 
 static void s_stub_releaseInterface(va_list * pParam)
-    SAL_THROW(())
 {
     /*uno_ExtEnvironment * pExtEnv = */va_arg(*pParam, uno_ExtEnvironment *);
     void               * pCppI   = va_arg(*pParam, void *);
@@ -166,13 +161,12 @@ static void s_stub_releaseInterface(va_list * pParam)
 }
 
 static void SAL_CALL releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
-    SAL_THROW(())
 {
     uno_Environment_invoke(&pExtEnv->aBase, s_stub_releaseInterface, pExtEnv, pCppI);
 }
 
 static void SAL_CALL environmentDisposing(
-    SAL_UNUSED_PARAMETER uno_Environment * ) SAL_THROW(())
+    SAL_UNUSED_PARAMETER uno_Environment * )
 {
 }
 
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index fe4a01517755..b2d17fd705d7 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -100,7 +100,6 @@ void freeCppInterfaceProxy(uno_ExtEnvironment * pEnv, void * pInterface)
 com::sun::star::uno::XInterface * CppInterfaceProxy::create(
     bridges::cpp_uno::shared::Bridge * pBridge, uno_Interface * pUnoI,
     typelib_InterfaceTypeDescription * pTypeDescr, OUString const & rOId)
-    SAL_THROW(())
 {
     typelib_typedescription_complete(
         reinterpret_cast< typelib_TypeDescription ** >(&pTypeDescr));
@@ -120,7 +119,7 @@ com::sun::star::uno::XInterface * CppInterfaceProxy::create(
     return castProxyToInterface(pProxy);
 }
 
-void CppInterfaceProxy::acquireProxy() SAL_THROW(())
+void CppInterfaceProxy::acquireProxy()
 {
     if (1 == osl_atomic_increment( &nRef ))
     {
@@ -134,7 +133,7 @@ void CppInterfaceProxy::acquireProxy() SAL_THROW(())
     }
 }
 
-void CppInterfaceProxy::releaseProxy() SAL_THROW(())
+void CppInterfaceProxy::releaseProxy()
 {
     if (! osl_atomic_decrement( &nRef )) // last release
     {
@@ -147,7 +146,6 @@ void CppInterfaceProxy::releaseProxy() SAL_THROW(())
 CppInterfaceProxy::CppInterfaceProxy(
     bridges::cpp_uno::shared::Bridge * pBridge_, uno_Interface * pUnoI_,
     typelib_InterfaceTypeDescription * pTypeDescr_, OUString const & rOId_)
-    SAL_THROW(())
     : nRef( 1 )
     , pBridge( pBridge_ )
     , pUnoI( pUnoI_ )
diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
index 9672f3c3c2a9..43d6c4e83ec8 100644
--- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
@@ -90,7 +90,7 @@ UnoInterfaceProxy * UnoInterfaceProxy::create(
     bridges::cpp_uno::shared::Bridge * pBridge,
     com::sun::star::uno::XInterface * pCppI,
     typelib_InterfaceTypeDescription * pTypeDescr,
-    OUString const & rOId) SAL_THROW(())
+    OUString const & rOId)
 {
     return new UnoInterfaceProxy(pBridge, pCppI, pTypeDescr, rOId);
 }
@@ -99,7 +99,6 @@ UnoInterfaceProxy::UnoInterfaceProxy(
     bridges::cpp_uno::shared::Bridge * pBridge_,
     com::sun::star::uno::XInterface * pCppI_,
     typelib_InterfaceTypeDescription * pTypeDescr_, OUString const & rOId_)
-    SAL_THROW(())
     : nRef( 1 )
     , pBridge( pBridge_ )
     , pCppI( pCppI_ )
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index 163530437fd9..5e29c12674b0 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -149,7 +149,7 @@ public:
           m_jo( jo )
         {}
     inline JLocalAutoRef( JLocalAutoRef & auto_ref );
-    inline ~JLocalAutoRef() SAL_THROW(());
+    inline ~JLocalAutoRef();
 
     inline jobject get() const
         { return m_jo; }
@@ -161,7 +161,7 @@ public:
     inline JLocalAutoRef & operator = ( JLocalAutoRef & auto_ref );
 };
 
-inline JLocalAutoRef::~JLocalAutoRef() SAL_THROW(())
+inline JLocalAutoRef::~JLocalAutoRef()
 {
     if (0 != m_jo)
         m_jni->DeleteLocalRef( m_jo );
@@ -240,7 +240,7 @@ class TypeDescr
 
 public:
     inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref );
-    inline ~TypeDescr() SAL_THROW(())
+    inline ~TypeDescr()
         { TYPELIB_DANGER_RELEASE( m_td ); }
 
     inline typelib_TypeDescription * get() const
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index 1cc914541e27..ed71b694788f 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -190,7 +190,7 @@ namespace jni_uno
 {
 
 
-void Bridge::acquire() const SAL_THROW(())
+void Bridge::acquire() const
 {
     if (1 == osl_atomic_increment( &m_ref ))
     {
@@ -212,7 +212,7 @@ void Bridge::acquire() const SAL_THROW(())
 }
 
 
-void Bridge::release() const SAL_THROW(())
+void Bridge::release() const
 {
     if (! osl_atomic_decrement( &m_ref ))
     {
@@ -255,7 +255,7 @@ Bridge::Bridge(
 }
 
 
-Bridge::~Bridge() SAL_THROW(())
+Bridge::~Bridge()
 {
     (*m_java_env->release)( m_java_env );
     (*((uno_Environment *)m_uno_env)->release)( (uno_Environment *)m_uno_env );
diff --git a/bridges/source/jni_uno/jni_bridge.h b/bridges/source/jni_uno/jni_bridge.h
index 5779ae71c866..e1a2aadecbb6 100644
--- a/bridges/source/jni_uno/jni_bridge.h
+++ b/bridges/source/jni_uno/jni_bridge.h
@@ -56,7 +56,7 @@ struct Bridge
 
     JNI_info const *            m_jni_info;
 
-    ~Bridge() SAL_THROW(());
+    ~Bridge();
     explicit Bridge(
         uno_Environment * java_env, uno_ExtEnvironment * uno_env,
         bool registered_java2uno );
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index 6657a05632f1..4a20eee6477e 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -128,7 +128,6 @@ sal_Int32 Client::get() throw (css::uno::RuntimeException) {
 
 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 Client(context));
 }
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index 7f8c675a1ae1..e119cd2b7366 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -92,7 +92,6 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
 
 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 Server(context));
 }