bridges: remove SAL_THROW macro

Change-Id: I2daafd711aedab17b6c13fde95c8af5f49d38a7c

4 files changed, 35 insertions, 35 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();