various: remove SAL_THROW macro

Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494

3 files changed, 61 insertions, 76 deletions

diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx
index 6efc506ebd4a..9e043491e332 100644
--- a/include/uno/current_context.hxx
+++ b/include/uno/current_context.hxx
@@ -42,7 +42,6 @@ namespace uno
     @return current context or null ref, if none is set
 */
 inline Reference< XCurrentContext > SAL_CALL getCurrentContext()
-    SAL_THROW(())
 {
     Reference< XCurrentContext > xRet;
     ::rtl::OUString aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME );
@@ -56,7 +55,6 @@ inline Reference< XCurrentContext > SAL_CALL getCurrentContext()
 */
 inline bool SAL_CALL setCurrentContext(
     Reference< XCurrentContext > const & xContext )
-    SAL_THROW(())
 {
     ::rtl::OUString aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME );
     return (::uno_setCurrentContext( xContext.get(), aEnvTypeName.pData, 0 ) != sal_False);
@@ -81,23 +79,20 @@ public:
         @param xNewContext new context to be set
     */
     inline ContextLayer(
-        Reference< XCurrentContext > const & xNewContext = Reference< XCurrentContext >() )
-        SAL_THROW(());
+        Reference< XCurrentContext > const & xNewContext = Reference< XCurrentContext >() );
     /** Destructor: restores the previous context.
     */
-    inline ~ContextLayer() SAL_THROW(());
+    inline ~ContextLayer();
 
     /** Gets the previously set context.
 
         @return the previously set context
     */
     inline Reference< XCurrentContext > SAL_CALL getPreviousContext() const
-        SAL_THROW(())
         { return m_xPreviousContext; }
 };
 
 inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewContext )
-    SAL_THROW(())
     : m_aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME )
 {
     ::uno_getCurrentContext( (void **)&m_xPreviousContext, m_aEnvTypeName.pData, 0 );
@@ -105,7 +100,6 @@ inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewCont
 }
 
 inline ContextLayer::~ContextLayer()
-    SAL_THROW(())
 {
     ::uno_setCurrentContext( m_xPreviousContext.get(), m_aEnvTypeName.pData, 0 );
 }
diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx
index d4b9aefa5502..1878ebcb376e 100644
--- a/include/uno/environment.hxx
+++ b/include/uno/environment.hxx
@@ -55,17 +55,17 @@ public:
                           respectively to current C++ Environment.
         @since UDK 3.2.7
     */
-    inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(CPPU_CURRENT_LANGUAGE_BINDING_NAME)) SAL_THROW(());
+    inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(CPPU_CURRENT_LANGUAGE_BINDING_NAME));
 
     /// @cond INTERNAL
     // these are here to force memory de/allocation to sal lib.
-    inline static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW(())
+    inline static void * SAL_CALL operator new ( size_t nSize )
         { return ::rtl_allocateMemory( nSize ); }
-    inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(())
+    inline static void SAL_CALL operator delete ( void * pMem )
         { ::rtl_freeMemory( pMem ); }
-    inline static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW(())
+    inline static void * SAL_CALL operator new ( size_t, void * pMem )
         { return pMem; }
-    inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(())
+    inline static void SAL_CALL operator delete ( void *, void * )
         {}
     /// @endcond
 
@@ -73,7 +73,7 @@ public:
 
         @param pEnv environment
     */
-    inline Environment( uno_Environment * pEnv = 0 ) SAL_THROW(());
+    inline Environment( uno_Environment * pEnv = 0 );
 
     /** Gets a specific environment. If the specified environment does not exist, then a default one
         is created and registered.
@@ -81,64 +81,64 @@ public:
         @param envDcp           descriptor of the environment
         @param pContext         context pointer
     */
-    inline explicit Environment( rtl::OUString const & envDcp, void * pContext = NULL ) SAL_THROW(());
+    inline explicit Environment( rtl::OUString const & envDcp, void * pContext = NULL );
 
 
     /** Copy constructor: acquires given environment
 
         @param rEnv another environment
     */
-    inline Environment( const Environment & rEnv ) SAL_THROW(());
+    inline Environment( const Environment & rEnv );
 
     /** Destructor: releases a set environment.
     */
-    inline ~Environment() SAL_THROW(());
+    inline ~Environment();
 
     /** Sets a given environment, i.e. acquires given one and releases a set one.
 
         @param pEnv another environment
         @return this environment
     */
-    inline Environment & SAL_CALL operator = ( uno_Environment * pEnv ) SAL_THROW(());
+    inline Environment & SAL_CALL operator = ( uno_Environment * pEnv );
     /** Sets a given environment, i.e. acquires given one and releases a set one.
 
         @param rEnv another environment
         @return this environment
     */
-    inline Environment & SAL_CALL operator = ( const Environment & rEnv ) SAL_THROW(())
+    inline Environment & SAL_CALL operator = ( const Environment & rEnv )
         { return operator = ( rEnv._pEnv ); }
 
     /** Provides UNacquired pointer to the set C environment.
 
         @return UNacquired pointer to the C environment struct
     */
-    inline uno_Environment * SAL_CALL get() const SAL_THROW(())
+    inline uno_Environment * SAL_CALL get() const
         { return _pEnv; }
 
     /** Gets type name of set environment.
 
         @return type name of set environment
     */
-    inline ::rtl::OUString SAL_CALL getTypeName() const SAL_THROW(())
+    inline ::rtl::OUString SAL_CALL getTypeName() const
         { return _pEnv->pTypeName; }
 
     /** Gets free context pointer of set environment.
 
         @return free context pointer of set environment
     */
-    inline void * SAL_CALL getContext() const SAL_THROW(())
+    inline void * SAL_CALL getContext() const
         { return _pEnv->pContext; }
 
     /** Tests if a environment is set.
 
         @return true, if a environment is set, false otherwise
     */
-    inline bool SAL_CALL is() const SAL_THROW(())
+    inline bool SAL_CALL is() const
         { return (_pEnv != 0); }
 
     /** Releases a set environment.
     */
-    inline void SAL_CALL clear() SAL_THROW(());
+    inline void SAL_CALL clear();
 
     /** Invoke the passed function in this environment.
 
@@ -146,7 +146,7 @@ public:
         @param pParam   the parameter pointer to be passed to the function
         @since UDK 3.2.7
     */
-    inline void SAL_CALL invoke_v(uno_EnvCallee * pCallee, va_list * pParam) const SAL_THROW(());
+    inline void SAL_CALL invoke_v(uno_EnvCallee * pCallee, va_list * pParam) const;
 
     /** Invoke the passed function in this environment.
 
@@ -154,49 +154,49 @@ public:
         @param ...      the parameters to be passed to the function
         @since UDK 3.2.7
     */
-    inline void SAL_CALL invoke(uno_EnvCallee * pCallee, ...) const SAL_THROW(());
+    inline void SAL_CALL invoke(uno_EnvCallee * pCallee, ...) const;
 
     /** Enter this environment explicitly.
 
         @since UDK 3.2.7
     */
-    inline void SAL_CALL enter() const SAL_THROW(());
+    inline void SAL_CALL enter() const;
 
     /** Checks, if it is valid to currently call objects
         belonging to this environment.
 
         @since UDK 3.2.7
     */
-    inline int  SAL_CALL isValid(rtl::OUString * pReason) const SAL_THROW(());
+    inline int  SAL_CALL isValid(rtl::OUString * pReason) const;
 };
 
-inline Environment::Environment( uno_Environment * pEnv ) SAL_THROW(())
+inline Environment::Environment( uno_Environment * pEnv )
     : _pEnv( pEnv )
 {
     if (_pEnv)
         (*_pEnv->acquire)( _pEnv );
 }
 
-inline Environment::Environment( rtl::OUString const & rEnvDcp, void * pContext ) SAL_THROW(())
+inline Environment::Environment( rtl::OUString const & rEnvDcp, void * pContext )
     : _pEnv(NULL)
 {
     uno_getEnvironment(&_pEnv, rEnvDcp.pData, pContext);
 }
 
-inline Environment::Environment( const Environment & rEnv ) SAL_THROW(())
+inline Environment::Environment( const Environment & rEnv )
     : _pEnv( rEnv._pEnv )
 {
     if (_pEnv)
         (*_pEnv->acquire)( _pEnv );
 }
 
-inline Environment::~Environment() SAL_THROW(())
+inline Environment::~Environment()
 {
     if (_pEnv)
         (*_pEnv->release)( _pEnv );
 }
 
-inline void Environment::clear() SAL_THROW(())
+inline void Environment::clear()
 {
     if (_pEnv)
     {
@@ -205,7 +205,7 @@ inline void Environment::clear() SAL_THROW(())
     }
 }
 
-inline Environment & Environment::operator = ( uno_Environment * pEnv ) SAL_THROW(())
+inline Environment & Environment::operator = ( uno_Environment * pEnv )
 {
     if (pEnv != _pEnv)
     {
@@ -218,13 +218,13 @@ inline Environment & Environment::operator = ( uno_Environment * pEnv ) SAL_THRO
     return *this;
 }
 
-inline void SAL_CALL Environment::invoke_v(uno_EnvCallee * pCallee, va_list * pParam) const SAL_THROW(())
+inline void SAL_CALL Environment::invoke_v(uno_EnvCallee * pCallee, va_list * pParam) const
 {
     if (_pEnv)
         uno_Environment_invoke_v(_pEnv, pCallee, pParam);
 }
 
-inline void SAL_CALL Environment::invoke(uno_EnvCallee * pCallee, ...) const SAL_THROW(())
+inline void SAL_CALL Environment::invoke(uno_EnvCallee * pCallee, ...) const
 {
     if (_pEnv)
     {
@@ -237,17 +237,17 @@ inline void SAL_CALL Environment::invoke(uno_EnvCallee * pCallee, ...) const SAL
 
 }
 
-inline void SAL_CALL Environment::enter() const SAL_THROW(())
+inline void SAL_CALL Environment::enter() const
 {
     uno_Environment_enter(_pEnv);
 }
 
-inline int  SAL_CALL Environment::isValid(rtl::OUString * pReason) const SAL_THROW(())
+inline int  SAL_CALL Environment::isValid(rtl::OUString * pReason) const
 {
     return uno_Environment_isValid(_pEnv, (rtl_uString **)pReason);
 }
 
-inline Environment Environment::getCurrent(rtl::OUString const & typeName) SAL_THROW(())
+inline Environment Environment::getCurrent(rtl::OUString const & typeName)
 {
     Environment environment;
 
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index dfc03ae1fdef..a75b315a8442 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -53,13 +53,13 @@ class Mapping
 public:
     // these are here to force memory de/allocation to sal lib.
     /// @cond INTERNAL
-    inline static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW(())
+    inline static void * SAL_CALL operator new ( size_t nSize )
         { return ::rtl_allocateMemory( nSize ); }
-    inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(())
+    inline static void SAL_CALL operator delete ( void * pMem )
         { ::rtl_freeMemory( pMem ); }
-    inline static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW(())
+    inline static void * SAL_CALL operator new ( size_t, void * pMem )
         { return pMem; }
-    inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(())
+    inline static void SAL_CALL operator delete ( void *, void * )
         {}
     /// @endcond
 
@@ -72,8 +72,7 @@ public:
     */
     inline Mapping(
         const ::rtl::OUString & rFrom, const ::rtl::OUString & rTo,
-        const ::rtl::OUString & rAddPurpose = ::rtl::OUString() )
-        SAL_THROW(());
+        const ::rtl::OUString & rAddPurpose = ::rtl::OUString() );
 
     /** Holds a mapping from the specified source to the specified destination.
 
@@ -83,8 +82,7 @@ public:
     */
     inline Mapping(
         uno_Environment * pFrom, uno_Environment * pTo,
-        const ::rtl::OUString & rAddPurpose = ::rtl::OUString() )
-        SAL_THROW(());
+        const ::rtl::OUString & rAddPurpose = ::rtl::OUString() );
 
     /** Holds a mapping from the specified source to the specified destination
         environment.
@@ -94,56 +92,55 @@ public:
         @param rAddPurpose  additional purpose
     */
     inline Mapping(const Environment & rFrom, const Environment & rTo,
-                   const ::rtl::OUString & rAddPurpose = ::rtl::OUString() )
-        SAL_THROW(());
+                   const ::rtl::OUString & rAddPurpose = ::rtl::OUString() );
 
     /** Constructor.
 
         @param pMapping another mapping
     */
-    inline Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW(());
+    inline Mapping( uno_Mapping * pMapping = 0 );
 
     /** Copy constructor.
 
         @param rMapping another mapping
     */
-    inline Mapping( const Mapping & rMapping ) SAL_THROW(());
+    inline Mapping( const Mapping & rMapping );
 
     /** Destructor.
     */
-    inline ~Mapping() SAL_THROW(());
+    inline ~Mapping();
 
     /** Sets a given mapping.
 
         @param pMapping another mapping
         @return this mapping
     */
-    inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping ) SAL_THROW(());
+    inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping );
     /** Sets a given mapping.
 
         @param rMapping another mapping
         @return this mapping
     */
-    inline Mapping & SAL_CALL operator = ( const Mapping & rMapping ) SAL_THROW(())
+    inline Mapping & SAL_CALL operator = ( const Mapping & rMapping )
         { return operator = ( rMapping._pMapping ); }
 
     /** Provides a pointer to the C mapping. The returned mapping is NOT acquired!
 
         @return UNacquired C mapping
     */
-    inline uno_Mapping * SAL_CALL get() const SAL_THROW(())
+    inline uno_Mapping * SAL_CALL get() const
         { return _pMapping; }
 
     /** Tests if a mapping is set.
 
         @return true if a mapping is set
     */
-    inline bool SAL_CALL is() const SAL_THROW(())
+    inline bool SAL_CALL is() const
         { return (_pMapping != 0); }
 
     /** Releases a set mapping.
     */
-    inline void SAL_CALL clear() SAL_THROW(());
+    inline void SAL_CALL clear();
 
     /** Maps an interface from one environment to another.
 
@@ -151,14 +148,14 @@ public:
         @param pTypeDescr       type description of interface
         @return                 mapped interface
     */
-    inline void * SAL_CALL mapInterface( void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const SAL_THROW(());
+    inline void * SAL_CALL mapInterface( void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const;
     /** Maps an interface from one environment to another.
 
         @param pInterface       source interface
         @param pTypeDescr       type description of interface
         @return                 mapped interface
     */
-    inline void * SAL_CALL mapInterface( void * pInterface, typelib_TypeDescription * pTypeDescr ) const SAL_THROW(())
+    inline void * SAL_CALL mapInterface( void * pInterface, typelib_TypeDescription * pTypeDescr ) const
         { return mapInterface( pInterface, (typelib_InterfaceTypeDescription *)pTypeDescr ); }
 
     /** Maps an interface from one environment to another.
@@ -168,7 +165,7 @@ public:
         @return                 mapped interface
     */
     inline void * SAL_CALL mapInterface(
-        void * pInterface, const ::com::sun::star::uno::Type & rType ) const SAL_THROW(());
+        void * pInterface, const ::com::sun::star::uno::Type & rType ) const;
 
     /** Maps an interface from one environment to another.
 
@@ -176,7 +173,7 @@ public:
         @param pInterface       source interface
         @param pTypeDescr       type description of interface
     */
-    inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const SAL_THROW(())
+    inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const
         { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, pTypeDescr ); }
     /** Maps an interface from one environment to another.
 
@@ -184,7 +181,7 @@ public:
         @param pInterface       source interface
         @param pTypeDescr       type description of interface
     */
-    inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_TypeDescription * pTypeDescr ) const SAL_THROW(())
+    inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_TypeDescription * pTypeDescr ) const
         { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, (typelib_InterfaceTypeDescription *)pTypeDescr ); }
 
     /** Maps an interface from one environment to another.
@@ -193,12 +190,11 @@ public:
         @param pInterface       source interface
         @param rType            type of interface to be mapped
      */
-    inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, const ::com::sun::star::uno::Type & rType ) const SAL_THROW(());
+    inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, const ::com::sun::star::uno::Type & rType ) const;
 };
 
 inline Mapping::Mapping(
     const ::rtl::OUString & rFrom, const ::rtl::OUString & rTo, const ::rtl::OUString & rAddPurpose )
-    SAL_THROW(())
     : _pMapping( 0 )
 {
     uno_getMappingByName( &_pMapping, rFrom.pData, rTo.pData, rAddPurpose.pData );
@@ -206,7 +202,6 @@ inline Mapping::Mapping(
 
 inline Mapping::Mapping(
     uno_Environment * pFrom, uno_Environment * pTo, const ::rtl::OUString & rAddPurpose )
-    SAL_THROW(())
     : _pMapping( 0 )
 {
     uno_getMapping( &_pMapping, pFrom, pTo, rAddPurpose.pData );
@@ -214,33 +209,32 @@ inline Mapping::Mapping(
 
 inline Mapping::Mapping(
     const Environment & rFrom, const Environment & rTo, const ::rtl::OUString & rAddPurpose )
-    SAL_THROW(())
         : _pMapping(0)
 {
     uno_getMapping( &_pMapping, rFrom.get(), rTo.get(), rAddPurpose.pData );
 }
 
-inline Mapping::Mapping( uno_Mapping * pMapping ) SAL_THROW(())
+inline Mapping::Mapping( uno_Mapping * pMapping )
     : _pMapping( pMapping )
 {
     if (_pMapping)
         (*_pMapping->acquire)( _pMapping );
 }
 
-inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW(())
+inline Mapping::Mapping( const Mapping & rMapping )
     : _pMapping( rMapping._pMapping )
 {
     if (_pMapping)
         (*_pMapping->acquire)( _pMapping );
 }
 
-inline Mapping::~Mapping() SAL_THROW(())
+inline Mapping::~Mapping()
 {
     if (_pMapping)
         (*_pMapping->release)( _pMapping );
 }
 
-inline void Mapping::clear() SAL_THROW(())
+inline void Mapping::clear()
 {
     if (_pMapping)
     {
@@ -249,7 +243,7 @@ inline void Mapping::clear() SAL_THROW(())
     }
 }
 
-inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(())
+inline Mapping & Mapping::operator = ( uno_Mapping * pMapping )
 {
     if (pMapping)
         (*pMapping->acquire)( pMapping );
@@ -261,7 +255,6 @@ inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(())
 
 inline void Mapping::mapInterface(
     void ** ppOut, void * pInterface, const ::com::sun::star::uno::Type & rType ) const
-    SAL_THROW(())
 {
     typelib_TypeDescription * pTD = 0;
     TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() );
@@ -274,7 +267,6 @@ inline void Mapping::mapInterface(
 
 inline void * Mapping::mapInterface(
     void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const
-    SAL_THROW(())
 {
     void * pOut = 0;
     (*_pMapping->mapInterface)( _pMapping, &pOut, pInterface, pTypeDescr );
@@ -283,7 +275,6 @@ inline void * Mapping::mapInterface(
 
 inline void * Mapping::mapInterface(
     void * pInterface, const ::com::sun::star::uno::Type & rType ) const
-    SAL_THROW(())
 {
     void * pOut = 0;
     mapInterface( &pOut, pInterface, rType );
@@ -303,7 +294,7 @@ inline void * Mapping::mapInterface(
     @deprecated
 */
 template< class C >
-inline bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_THROW(())
+inline bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI )
 {
     Mapping aMapping(
         ::rtl::OUString( UNO_LB_UNO ),
@@ -326,7 +317,7 @@ inline bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_THROW(
     @deprecated
 */
 template< class C >
-inline bool mapToUno( uno_Interface ** ppRet, const Reference< C > & x ) SAL_THROW(())
+inline bool mapToUno( uno_Interface ** ppRet, const Reference< C > & x )
 {
     Mapping aMapping(
         ::rtl::OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ),