diff options
| author | Alexander Bergmann <myaddons@gmx.de> | 2012-01-26 16:00:09 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-26 17:41:07 +0000 |
| commit | 0439af27e1f37b19d4409f34f974d6ade49f99bf (patch) | |
| tree | 13bbb2549319d74a1a109bf2727aab37dca5b8c7 | |
| parent | f1cb0a4ab4f11dc015be1696c7c7751802171915 (diff) | |
Code cleanup: ( () ) replaced by (())
173 files changed, 1406 insertions, 1406 deletions
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx index 42bca5d89e0f..14126647c518 100644 --- a/bridges/inc/bridges/cpp_uno/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/bridge.hxx @@ -40,7 +40,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 ) SAL_THROW(()) { cppu_cppInterfaceProxy * pThis = static_cast< cppu_cppInterfaceProxy * >( @@ -60,7 +60,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 ) SAL_THROW(()) { OSL_ASSERT( ppCppI && pTypeDescr ); if (*ppCppI) @@ -100,7 +100,7 @@ inline void SAL_CALL cppu_Mapping_uno2cpp( } } //__________________________________________________________________________________________________ -inline void cppu_cppInterfaceProxy::acquireProxy() SAL_THROW( () ) +inline void cppu_cppInterfaceProxy::acquireProxy() SAL_THROW(()) { if (1 == osl_incrementInterlockedCount( &nRef )) { @@ -114,7 +114,7 @@ inline void cppu_cppInterfaceProxy::acquireProxy() SAL_THROW( () ) } } //__________________________________________________________________________________________________ -inline void cppu_cppInterfaceProxy::releaseProxy() SAL_THROW( () ) +inline void cppu_cppInterfaceProxy::releaseProxy() SAL_THROW(()) { if (! osl_decrementInterlockedCount( &nRef )) // last release { @@ -126,7 +126,7 @@ inline void cppu_cppInterfaceProxy::releaseProxy() SAL_THROW( () ) //__________________________________________________________________________________________________ inline cppu_cppInterfaceProxy::cppu_cppInterfaceProxy( cppu_Bridge * pBridge_, uno_Interface * pUnoI_, - typelib_InterfaceTypeDescription * pTypeDescr_, const ::rtl::OUString & rOId_ ) SAL_THROW( () ) + typelib_InterfaceTypeDescription * pTypeDescr_, const ::rtl::OUString & rOId_ ) SAL_THROW(()) : nRef( 1 ) , pBridge( pBridge_ ) , pUnoI( pUnoI_ ) @@ -150,7 +150,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 ) SAL_THROW(()) { cppu_unoInterfaceProxy * pThis = static_cast< cppu_unoInterfaceProxy * >( @@ -168,7 +168,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 ) SAL_THROW(()) { if (1 == osl_incrementInterlockedCount( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef )) { @@ -189,7 +189,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 ) SAL_THROW(()) { if (! osl_decrementInterlockedCount( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef )) { @@ -201,7 +201,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 ) SAL_THROW(()) { OSL_ENSURE( ppUnoI && pTypeDescr, "### null ptr!" ); if (*ppUnoI) @@ -243,7 +243,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 ::rtl::OUString & rOId_ ) SAL_THROW( () ) + typelib_InterfaceTypeDescription * pTypeDescr_, const ::rtl::OUString & rOId_ ) SAL_THROW(()) : nRef( 1 ) , pBridge( pBridge_ ) , pCppI( pCppI_ ) @@ -272,19 +272,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 ) SAL_THROW(()) { 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 ) SAL_THROW(()) { 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_ ) SAL_THROW(()) : nRef( 1 ) , pCppEnv( pCppEnv_ ) , pUnoEnv( pUnoEnv_ ) @@ -306,19 +306,19 @@ inline cppu_Bridge::cppu_Bridge( (*((uno_Environment *)pUnoEnv)->acquire)( (uno_Environment *)pUnoEnv ); } //__________________________________________________________________________________________________ -inline cppu_Bridge::~cppu_Bridge() SAL_THROW( () ) +inline cppu_Bridge::~cppu_Bridge() SAL_THROW(()) { (*((uno_Environment *)pUnoEnv)->release)( (uno_Environment *)pUnoEnv ); (*((uno_Environment *)pCppEnv)->release)( (uno_Environment *)pCppEnv ); g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } //__________________________________________________________________________________________________ -inline void SAL_CALL cppu_Bridge_free( uno_Mapping * pMapping ) SAL_THROW( () ) +inline void SAL_CALL cppu_Bridge_free( uno_Mapping * pMapping ) SAL_THROW(()) { delete static_cast< cppu_Mapping * >( pMapping )->pBridge; } //__________________________________________________________________________________________________ -inline void cppu_Bridge::acquire() SAL_THROW( () ) +inline void cppu_Bridge::acquire() SAL_THROW(()) { if (1 == osl_incrementInterlockedCount( &nRef )) { @@ -339,7 +339,7 @@ inline void cppu_Bridge::acquire() SAL_THROW( () ) } } //__________________________________________________________________________________________________ -inline void cppu_Bridge::release() SAL_THROW( () ) +inline void cppu_Bridge::release() SAL_THROW(()) { if (! osl_decrementInterlockedCount( &nRef )) { @@ -349,7 +349,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 ) SAL_THROW(()) { OSL_ASSERT( ppMapping && pFrom && pTo ); if (ppMapping && pFrom && pTo && pFrom->pExtEnv && pTo->pExtEnv) @@ -397,7 +397,7 @@ static ::rtl::OUString * s_pStaticOidPart = 0; // environment init stuff //-------------------------------------------------------------------------------------------------- -inline const ::rtl::OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW( () ) +inline const ::rtl::OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(()) { #if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) static ::rtl::OUString * s_pStaticOidPart = 0; @@ -429,7 +429,7 @@ inline const ::rtl::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 ) SAL_THROW(()) { OSL_ENSURE( pEnv && ppOId && pInterface, "### null ptr!" ); if (pEnv && ppOId && pInterface) @@ -471,22 +471,22 @@ 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 ) SAL_THROW(()) { 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 ) SAL_THROW(()) { 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 * ) SAL_THROW(()) { g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } //-------------------------------------------------------------------------------------------------- -inline void SAL_CALL cppu_cppenv_initEnvironment( uno_Environment * pCppEnv ) SAL_THROW( () ) +inline void SAL_CALL cppu_cppenv_initEnvironment( uno_Environment * pCppEnv ) SAL_THROW(()) { 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/type_misc.hxx b/bridges/inc/bridges/cpp_uno/type_misc.hxx index 5fbd0da45cac..f721fb125b42 100644 --- a/bridges/inc/bridges/cpp_uno/type_misc.hxx +++ b/bridges/inc/bridges/cpp_uno/type_misc.hxx @@ -37,7 +37,7 @@ @param pTypeDescr type description of type @return true if type might relate to an interface, false otherwise */ -inline bool cppu_relatesToInterface( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) +inline bool cppu_relatesToInterface( typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) { switch (pTypeDescr->eTypeClass) { @@ -111,7 +111,7 @@ inline bool cppu_relatesToInterface( typelib_TypeDescription * pTypeDescr ) SAL_ @param eTypeClass type class of type @return true if type is a cpp simple type, false otherwise */ -inline bool cppu_isSimpleType( typelib_TypeClass eTypeClass ) SAL_THROW( () ) +inline bool cppu_isSimpleType( typelib_TypeClass eTypeClass ) SAL_THROW(()) { return (eTypeClass <= typelib_TypeClass_ENUM && eTypeClass != typelib_TypeClass_STRING && @@ -122,7 +122,7 @@ inline bool cppu_isSimpleType( typelib_TypeClass eTypeClass ) SAL_THROW( () ) @param pTypeDescr type description of type @return true if type is a cpp simple type, false otherwise */ -inline bool cppu_isSimpleType( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) +inline bool cppu_isSimpleType( typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) { return cppu_isSimpleType( pTypeDescr->eTypeClass ); } diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx index 9cf236c99574..fe0a556d9090 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx @@ -61,7 +61,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #ifdef DEBUG char const * start = p; @@ -110,24 +110,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 df5b32460c42..f28d9e294841 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx @@ -61,7 +61,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -110,24 +110,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 13bc93c487be..09cdb4526d6c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx @@ -61,7 +61,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -110,24 +110,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 cbf33534541d..6773228402d6 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx @@ -62,7 +62,7 @@ namespace CPPU_CURRENT_NAMESPACE } //=================================================================== - static OUString toUNOname( char const * p ) SAL_THROW( () ) + static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -113,20 +113,20 @@ namespace CPPU_CURRENT_NAMESPACE #endif public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW( () ); + type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW(()); }; //____________________________________________________________________ - RTTI::RTTI() SAL_THROW( () ) + RTTI::RTTI() SAL_THROW(()) #ifndef ANDROID : m_hApp( dlopen( 0, RTLD_LAZY ) ) #endif { } //____________________________________________________________________ - RTTI::~RTTI() SAL_THROW( () ) + RTTI::~RTTI() SAL_THROW(()) { #ifndef ANDROID dlclose( m_hApp ); @@ -134,7 +134,7 @@ namespace CPPU_CURRENT_NAMESPACE } //____________________________________________________________________ - type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) + type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 84c642e147a4..b743471adb56 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx @@ -62,7 +62,7 @@ namespace CPPU_CURRENT_NAMESPACE } //=================================================================== - static OUString toUNOname( char const * p ) SAL_THROW( () ) + static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -111,24 +111,24 @@ namespace CPPU_CURRENT_NAMESPACE void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW( () ); + type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW(()); }; //____________________________________________________________________ - RTTI::RTTI() SAL_THROW( () ) + RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //____________________________________________________________________ - RTTI::~RTTI() SAL_THROW( () ) + RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //____________________________________________________________________ - type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) + type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 b7c235627534..73ea00a94404 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx @@ -61,7 +61,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -110,24 +110,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 26755f3cd6bd..c21df26411c0 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -62,7 +62,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -111,13 +111,13 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) #if defined(FREEBSD) && __FreeBSD_version < 702104 : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) #else @@ -126,13 +126,13 @@ RTTI::RTTI() SAL_THROW( () ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 84c642e147a4..b743471adb56 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx @@ -62,7 +62,7 @@ namespace CPPU_CURRENT_NAMESPACE } //=================================================================== - static OUString toUNOname( char const * p ) SAL_THROW( () ) + static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -111,24 +111,24 @@ namespace CPPU_CURRENT_NAMESPACE void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW( () ); + type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW(()); }; //____________________________________________________________________ - RTTI::RTTI() SAL_THROW( () ) + RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //____________________________________________________________________ - RTTI::~RTTI() SAL_THROW( () ) + RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //____________________________________________________________________ - type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) + type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 804433d565aa..c94d32d68fd5 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx @@ -59,7 +59,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if defined BRIDGES_DEBUG char const * start = p; @@ -108,24 +108,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 b7c235627534..73ea00a94404 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx @@ -61,7 +61,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -110,24 +110,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 b7c235627534..73ea00a94404 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx @@ -61,7 +61,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -110,24 +110,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 b7c235627534..73ea00a94404 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx @@ -61,7 +61,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -110,24 +110,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 13bc93c487be..09cdb4526d6c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx @@ -61,7 +61,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -110,24 +110,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 15b0ff8c15f0..d8fc0a427702 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx @@ -60,7 +60,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if defined BRIDGES_DEBUG char const * start = p; @@ -109,24 +109,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 0b92ab6814e9..91cf804c228f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -414,7 +414,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_THROW(()) { 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 341a128a7045..fca8cb9ae2a2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -62,7 +62,7 @@ void dummy_can_throw_anything( SAL_UNUSED_PARAMETER char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -111,13 +111,13 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) #if defined(FREEBSD) && __FreeBSD_version < 702104 : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) #else @@ -126,13 +126,13 @@ RTTI::RTTI() SAL_THROW( () ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 e950f3473b7c..f2785d44fdbb 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx @@ -115,7 +115,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -164,24 +164,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 b229a95065c4..19b2dc609bd1 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx @@ -60,7 +60,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #ifdef DEBUG char const * start = p; @@ -109,24 +109,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 8989fe6407ca..3ce09c3407a2 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx @@ -61,7 +61,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -110,24 +110,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { 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 29f33a8e6c2e..bcf23e26a7a8 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx @@ -59,7 +59,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if defined BRIDGES_DEBUG char const * start = p; @@ -108,24 +108,24 @@ class RTTI void * m_hApp; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) : m_hApp( dlopen( 0, RTLD_LAZY ) ) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { dlclose( m_hApp ); } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { type_info * rtti; diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx index 40a3b13cb3af..4b745885152f 100644 --- a/bridges/source/cpp_uno/mingw_intel/except.cxx +++ b/bridges/source/cpp_uno/mingw_intel/except.cxx @@ -61,7 +61,7 @@ void dummy_can_throw_anything( char const * ) } //================================================================================================== -static OUString toUNOname( char const * p ) SAL_THROW( () ) +static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 char const * start = p; @@ -108,22 +108,22 @@ class RTTI t_rtti_map m_generatedRttis; public: - RTTI() SAL_THROW( () ); - ~RTTI() SAL_THROW( () ); + RTTI() SAL_THROW(()); + ~RTTI() SAL_THROW(()); - type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); + type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(()); }; //__________________________________________________________________________________________________ -RTTI::RTTI() SAL_THROW( () ) +RTTI::RTTI() SAL_THROW(()) { } //__________________________________________________________________________________________________ -RTTI::~RTTI() SAL_THROW( () ) +RTTI::~RTTI() SAL_THROW(()) { } //__________________________________________________________________________________________________ -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) +type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(()) { type_info * rtti; diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index b6914de1a97e..6f6bf255a1ac 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -61,7 +61,7 @@ namespace { static ::rtl::OUString * s_pStaticOidPart = 0; #endif -const ::rtl::OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW( () ) +const ::rtl::OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(()) { #if ! ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) \ || (defined(__GNUC__) && defined(__APPLE__))) @@ -99,7 +99,7 @@ const ::rtl::OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW( () ) extern "C" { static void s_stub_computeObjectIdentifier(va_list * pParam) - SAL_THROW( () ) + SAL_THROW(()) { uno_ExtEnvironment * pEnv = va_arg(*pParam, uno_ExtEnvironment *); rtl_uString ** ppOId = va_arg(*pParam, rtl_uString **); @@ -154,13 +154,13 @@ static void s_stub_computeObjectIdentifier(va_list * pParam) static void SAL_CALL computeObjectIdentifier( uno_ExtEnvironment * pExtEnv, rtl_uString ** ppOId, void * pInterface ) - SAL_THROW( () ) + SAL_THROW(()) { uno_Environment_invoke(&pExtEnv->aBase, s_stub_computeObjectIdentifier, pExtEnv, ppOId, pInterface); } static void s_stub_acquireInterface(va_list * pParam) - SAL_THROW( () ) + SAL_THROW(()) { /*uno_ExtEnvironment * pExtEnv = */va_arg(*pParam, uno_ExtEnvironment *); void * pCppI = va_arg(*pParam, void *); @@ -169,13 +169,13 @@ static void s_stub_acquireInterface(va_list * pParam) } static void SAL_CALL acquireInterface( uno_ExtEnvironment * pExtEnv, void * pCppI ) - SAL_THROW( () ) + SAL_THROW(()) { uno_Environment_invoke(&pExtEnv->aBase, s_stub_acquireInterface, pExtEnv, pCppI); } static void s_stub_releaseInterface(va_list * pParam) - SAL_THROW( () ) + SAL_THROW(()) { /*uno_ExtEnvironment * pExtEnv = */va_arg(*pParam, uno_ExtEnvironment *); void * pCppI = va_arg(*pParam, void *); @@ -184,13 +184,13 @@ static void s_stub_releaseInterface(va_list * pParam) } static void SAL_CALL releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCppI ) - SAL_THROW( () ) + 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 * ) SAL_THROW(()) { bridges::cpp_uno::shared::g_moduleCount.modCnt.release( &bridges::cpp_uno::shared::g_moduleCount.modCnt ); diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index cc23cd1b2a8f..e9345a32aacf 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -169,7 +169,7 @@ public: m_jo( jo ) {} inline JLocalAutoRef( JLocalAutoRef & auto_ref ); - inline ~JLocalAutoRef() SAL_THROW( () ); + inline ~JLocalAutoRef() SAL_THROW(()); inline jobject get() const { return m_jo; } @@ -182,7 +182,7 @@ public: }; //______________________________________________________________________________ -inline JLocalAutoRef::~JLocalAutoRef() SAL_THROW( () ) +inline JLocalAutoRef::~JLocalAutoRef() SAL_THROW(()) { if (0 != m_jo) m_jni->DeleteLocalRef( m_jo ); @@ -268,7 +268,7 @@ class TypeDescr public: inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref ); - inline ~TypeDescr() SAL_THROW( () ) + inline ~TypeDescr() SAL_THROW(()) { 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 3fee956d4b93..a4548e17361b 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -212,7 +212,7 @@ namespace jni_uno { //______________________________________________________________________________ -void Bridge::acquire() const SAL_THROW( () ) +void Bridge::acquire() const SAL_THROW(()) { if (1 == osl_incrementInterlockedCount( &m_ref )) { @@ -234,7 +234,7 @@ void Bridge::acquire() const SAL_THROW( () ) } //______________________________________________________________________________ -void Bridge::release() const SAL_THROW( () ) +void Bridge::release() const SAL_THROW(()) { if (! osl_decrementInterlockedCount( &m_ref )) { @@ -278,7 +278,7 @@ Bridge::Bridge( } //______________________________________________________________________________ -Bridge::~Bridge() SAL_THROW( () ) +Bridge::~Bridge() SAL_THROW(()) { (*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 f2298fbdbe46..08d22e15f396 100644 --- a/bridges/source/jni_uno/jni_bridge.h +++ b/bridges/source/jni_uno/jni_bridge.h @@ -67,7 +67,7 @@ struct Bridge JNI_info const * m_jni_info; // - ~Bridge() SAL_THROW( () ); + ~Bridge() SAL_THROW(()); explicit Bridge( uno_Environment * java_env, uno_ExtEnvironment * uno_env, bool registered_java2uno ); diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h index 8d70d228dc1e..20a88d144872 100644 --- a/cli_ure/source/uno_bridge/cli_base.h +++ b/cli_ure/source/uno_bridge/cli_base.h @@ -157,7 +157,7 @@ class TypeDescr public: inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref ); - inline ~TypeDescr() SAL_THROW( () ) + inline ~TypeDescr() SAL_THROW(()) { TYPELIB_DANGER_RELEASE( m_td ); } inline typelib_TypeDescription * get() const diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 19ed2e503754..c910d8e5953f 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -199,7 +199,7 @@ namespace cli_uno calls acquire then they must have kept an unacquired pointer which is illegal. */ -void Bridge::acquire() const SAL_THROW( () ) +void Bridge::acquire() const SAL_THROW(()) { if (1 == osl_incrementInterlockedCount( &m_ref )) { @@ -218,7 +218,7 @@ void Bridge::acquire() const SAL_THROW( () ) } } //__________________________________________________________________________________________________ -void Bridge::release() const SAL_THROW( () ) +void Bridge::release() const SAL_THROW(()) { if (! osl_decrementInterlockedCount( &m_ref )) { @@ -255,7 +255,7 @@ Bridge::Bridge( } //__________________________________________________________________________________________________ -Bridge::~Bridge() SAL_THROW( () ) +Bridge::~Bridge() SAL_THROW(()) { //System::GC::Collect(); (*m_uno_cli_env->release)( m_uno_cli_env ); diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h index 34d6ed294d4d..0306e4dd6357 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.h +++ b/cli_ure/source/uno_bridge/cli_bridge.h @@ -74,7 +74,7 @@ struct Bridge Mapping m_uno2cli; bool m_registered_cli2uno; - ~Bridge() SAL_THROW( () ); + ~Bridge() SAL_THROW(()); Bridge( uno_Environment * java_env, uno_ExtEnvironment * uno_env, bool registered_java2uno ); void acquire() const; diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index ccc7a8135bf1..763441bdd932 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -2588,7 +2588,7 @@ sal_Bool StructureType::dumpHxxFile( dumpTemplateHead(o); o << "inline " << m_name; dumpTemplateParameters(o); - o << "::" << m_name << "() SAL_THROW( () )\n"; + o << "::" << m_name << "() SAL_THROW(())\n"; inc(); OString superType; if (m_reader.getSuperTypeCount() >= 1) { @@ -2668,7 +2668,7 @@ sal_Bool StructureType::dumpHxxFile( // o << " __" << fieldName; o << " " << fieldName << "_"; } - o << ") SAL_THROW( () )\n"; + o << ") SAL_THROW(())\n"; inc(); first = sal_True; @@ -3254,7 +3254,7 @@ void ExceptionType::dumpDeclaration(FileStream& o) o << "\n{\npublic:\n"; inc(); o << indent() << "inline CPPU_GCC_DLLPRIVATE " << m_name - << "() SAL_THROW( () );\n\n"; + << "() SAL_THROW(());\n\n"; sal_uInt16 fieldCount = m_reader.getFieldCount(); RTFieldAccess access = RT_ACCESS_INVALID; @@ -3289,7 +3289,7 @@ void ExceptionType::dumpDeclaration(FileStream& o) // o << " __" << fieldName; o << " " << fieldName << "_"; } - o << ") SAL_THROW( () );\n\n"; + o << ") SAL_THROW(());\n\n"; } o << indent() << "inline CPPU_GCC_DLLPRIVATE " << m_name << "(" << m_name << " const &);\n\n" @@ -3341,7 +3341,7 @@ sal_Bool ExceptionType::dumpHxxFile( } o << "\n"; - o << "inline " << m_name << "::" << m_name << "() SAL_THROW( () )\n"; + o << "inline " << m_name << "::" << m_name << "() SAL_THROW(())\n"; inc(); OString superType; if (m_reader.getSuperTypeCount() >= 1) { @@ -3421,7 +3421,7 @@ sal_Bool ExceptionType::dumpHxxFile( // o << " __" << fieldName; o << " " << fieldName << "_"; } - o << ") SAL_THROW( () )\n"; + o << ") SAL_THROW(())\n"; inc(); first = sal_True; @@ -3795,7 +3795,7 @@ sal_Bool TypeDefType::dumpHFile( // o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n" // << "class Type;\n} } } }\n\n"; // o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << m_typeName.replace('/', '_') -// << "_Type( ) SAL_THROW( () );\n\n"; +// << "_Type( ) SAL_THROW(());\n\n"; o << "#endif // "<< headerDefine << "\n"; diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx index e483ab949f4a..79f666f0cf59 100644 --- a/connectivity/inc/connectivity/CommonTools.hxx +++ b/connectivity/inc/connectivity/CommonTools.hxx @@ -100,13 +100,13 @@ namespace connectivity std::vector< VectorVal > & get() { return m_vector; } std::vector< VectorVal > const & get() const { return m_vector; } - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) {} void acquire() diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx index 955f8227c74a..64f44d487153 100644 --- a/connectivity/inc/connectivity/FValue.hxx +++ b/connectivity/inc/connectivity/FValue.hxx @@ -228,13 +228,13 @@ namespace connectivity free(); } - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) { } ORowSetValue& operator=(const ORowSetValue& _rRH); diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx index eb316a80950d..b7cc0c06bcfe 100644 --- a/connectivity/inc/connectivity/sqliterator.hxx +++ b/connectivity/inc/connectivity/sqliterator.hxx @@ -142,13 +142,13 @@ namespace connectivity const OSQLParseNode* pRoot = NULL ); ~OSQLParseTreeIterator(); - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) { } void dispose(); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index 6acf6741bb24..b5bab384ed01 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx @@ -47,10 +47,10 @@ struct ini_NameValue rtl::OUString sName; rtl::OUString sValue; - inline ini_NameValue() SAL_THROW( () ) + inline ini_NameValue() SAL_THROW(()) {} inline ini_NameValue( - OUString const & name, OUString const & value ) SAL_THROW( () ) + OUString const & name, OUString const & value ) SAL_THROW(()) : sName( name ), sValue( value ) {} diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 93ca427166a7..dce19c777808 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -324,7 +324,7 @@ void OOneInstanceComponentFactory::disposing() // ::rtl::OUString const & rImplementationName, // ::com::sun::star::uno::Sequence< ::rtl::OUString > const & rServiceNames, // rtl_ModuleCount * pModCount = 0 ) -// SAL_THROW( () ) +// SAL_THROW(()) // { // return new OOneInstanceComponentFactory( rImplementationName, fptr , rServiceNames); // } diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx index 7efae973384f..076a4e68123f 100644 --- a/connectivity/source/inc/OColumn.hxx +++ b/connectivity/source/inc/OColumn.hxx @@ -108,13 +108,13 @@ namespace connectivity m_ColumnLabel = _aColumnName; } - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t ,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t ,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) { } sal_Bool isAutoIncrement() const { return m_AutoIncrement; } diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index 13f0fd2975ce..825bf4e90697 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.hxx @@ -73,13 +73,13 @@ namespace connectivity ,bUnsigned(sal_False) {} - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW(()) { } sal_Bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx index b5fa33b5c493..150a8ab96996 100644 --- a/connectivity/source/inc/TKeyValue.hxx +++ b/connectivity/source/inc/TKeyValue.hxx @@ -46,13 +46,13 @@ namespace connectivity ~OKeyValue(); - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) { } static OKeyValue* createKeyValue(sal_Int32 nVal); diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index 19548a5e8ccd..90e69d25e8c4 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.hxx @@ -50,13 +50,13 @@ namespace connectivity OSkipDeletedSet(IResultSetHelper* _pHelper); ~OSkipDeletedSet(); - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) { } /** diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index 21212bc90ce6..419966f3e5b7 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.hxx @@ -72,13 +72,13 @@ namespace connectivity ~OSortIndex(); - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) { } diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index 386807c05391..03045f7476aa 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -55,13 +55,13 @@ namespace connectivity public: OSQLAnalyzer(OConnection* _pConnection); virtual ~OSQLAnalyzer(); - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW(()) { } OConnection* getConnection() const { return m_pConnection; } diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index ce489a34832d..c74e633ce7a5 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -62,13 +62,13 @@ namespace connectivity OCode(); virtual ~OCode(); - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW(()) { } TYPEINFO(); diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index 8a09061d3781..ebf6c3b340f0 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -60,13 +60,13 @@ namespace connectivity virtual ~OPredicateCompiler(); - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW(()) { } void dispose(); diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx index 87ab6e783337..66f2b768dd9f 100644 --- a/connectivity/source/inc/sqlscan.hxx +++ b/connectivity/source/inc/sqlscan.hxx @@ -53,13 +53,13 @@ namespace connectivity OSQLScanner(); virtual ~OSQLScanner(); - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) { } virtual sal_Int32 SQLyygetc(void); diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx index 051595999753..93148b9ac72f 100644 --- a/connectivity/workben/iniParser/main.cxx +++ b/connectivity/workben/iniParser/main.cxx @@ -44,10 +44,10 @@ struct ini_NameValue rtl::OUString sName; rtl::OUString sValue; - inline ini_NameValue() SAL_THROW( () ) + inline ini_NameValue() SAL_THROW(()) {} inline ini_NameValue( - OUString const & name, OUString const & value ) SAL_THROW( () ) + OUString const & name, OUString const & value ) SAL_THROW(()) : sName( name ), sValue( value ) {} diff --git a/cppu/inc/com/sun/star/uno/Any.h b/cppu/inc/com/sun/star/uno/Any.h index b904d08ec356..f5f2f72be8f8 100644 --- a/cppu/inc/com/sun/star/uno/Any.h +++ b/cppu/inc/com/sun/star/uno/Any.h @@ -57,19 +57,19 @@ class Any : public uno_Any public: /// @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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(()) {} /// @endcond /** Default constructor: Any holds no value; its type is void. */ - inline Any() SAL_THROW( () ); + inline Any() SAL_THROW(()); /** Templated ctor. Sets a copy of the given value. @@ -84,51 +84,51 @@ public: @param rAny another any */ - inline Any( const Any & rAny ) SAL_THROW( () ); + inline Any( const Any & rAny ) SAL_THROW(()); /** Constructor: Sets a copy of the given data. @param pData_ value @param rType type of value */ - inline Any( const void * pData_, const Type & rType ) SAL_THROW( () ); + inline Any( const void * pData_, const Type & rType ) SAL_THROW(()); /** Constructor: Sets a copy of the given data. @param pData_ value @param pTypeDescr type of value */ - inline Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ); + inline Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(()); /** Constructor: Sets a copy of the given data. @param pData_ value @param pType type of value */ - inline Any( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW( () ); + inline Any( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW(()); /** Destructor: Destructs any content and frees memory. */ - inline ~Any() SAL_THROW( () ); + inline ~Any() SAL_THROW(()); /** Assignment operator: Sets the value of the given any. @param rAny another any (right side) @return this any */ - inline Any & SAL_CALL operator = ( const Any & rAny ) SAL_THROW( () ); + inline Any & SAL_CALL operator = ( const Any & rAny ) SAL_THROW(()); /** Gets the type of the set value. @return a Type object of the set value */ - inline const Type & SAL_CALL getValueType() const SAL_THROW( () ) + inline const Type & SAL_CALL getValueType() const SAL_THROW(()) { return * reinterpret_cast< const Type * >( &pType ); } /** Gets the type of the set value. @return the UNacquired type description reference of the set value */ - inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const SAL_THROW( () ) + inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const SAL_THROW(()) { return pType; } /** Gets the type description of the set value. Provides ownership of the type description! @@ -136,34 +136,34 @@ public: @param a pointer to type description pointer */ - inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const SAL_THROW( () ) + inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const SAL_THROW(()) { ::typelib_typedescriptionreference_getDescription( ppTypeDescr, pType ); } /** Gets the type class of the set value. @return the type class of the set value */ - inline TypeClass SAL_CALL getValueTypeClass() const SAL_THROW( () ) + inline TypeClass SAL_CALL getValueTypeClass() const SAL_THROW(()) { return (TypeClass)pType->eTypeClass; } /** Gets the type name of the set value. @return the type name of the set value */ - inline ::rtl::OUString SAL_CALL getValueTypeName() const SAL_THROW( () ); + inline ::rtl::OUString SAL_CALL getValueTypeName() const SAL_THROW(()); /** Tests if any contains a value. @return true if any has a value, false otherwise */ - inline sal_Bool SAL_CALL hasValue() const SAL_THROW( () ) + inline sal_Bool SAL_CALL hasValue() const SAL_THROW(()) { return (typelib_TypeClass_VOID != pType->eTypeClass); } /** Gets a pointer to the set value. @return a pointer to the set value */ - inline const void * SAL_CALL getValue() const SAL_THROW( () ) + inline const void * SAL_CALL getValue() const SAL_THROW(()) { return pData; } #if ! defined(EXCEPTIONS_OFF) @@ -190,26 +190,26 @@ public: @param pData_ pointer to value @param rType type of value */ - inline void SAL_CALL setValue( const void * pData_, const Type & rType ) SAL_THROW( () ); + inline void SAL_CALL setValue( const void * pData_, const Type & rType ) SAL_THROW(()); /** Sets a value. If the any already contains a value, that value will be destructed and its memory freed. @param pData_ pointer to value @param pType type of value */ - inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW( () ); + inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW(()); /** Sets a value. If the any already contains a value, that value will be destructed and its memory freed. @param pData_ pointer to value @param pTypeDescr type description of value */ - inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ); + inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(()); /** Clears this any. If the any already contains a value, that value will be destructed and its memory freed. After this has been called, the any does not contain a value. */ - inline void SAL_CALL clear() SAL_THROW( () ); + inline void SAL_CALL clear() SAL_THROW(()); /** Tests whether this any is extractable to a value of given type. Widening conversion without data loss is taken into account. @@ -217,7 +217,7 @@ public: @param rType destination type @return true if this any is extractable to value of given type (e.g. using >>= operator) */ - inline sal_Bool SAL_CALL isExtractableTo( const Type & rType ) const SAL_THROW( () ); + inline sal_Bool SAL_CALL isExtractableTo( const Type & rType ) const SAL_THROW(()); /** Tests whether this any can provide a value of specified type. Widening conversion without data loss is taken into account. @@ -234,14 +234,14 @@ public: @param rAny another any (right side) @return true if both any contains equal values */ - inline sal_Bool SAL_CALL operator == ( const Any & rAny ) const SAL_THROW( () ); + inline sal_Bool SAL_CALL operator == ( const Any & rAny ) const SAL_THROW(()); /** Unequality operator: compares two anys. The values need not be of equal type, e.g. a short integer is compared to a long integer. @param rAny another any (right side) @return true if both any contains unequal values */ - inline sal_Bool SAL_CALL operator != ( const Any & rAny ) const SAL_THROW( () ); + inline sal_Bool SAL_CALL operator != ( const Any & rAny ) const SAL_THROW(()); private: // not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16) @@ -266,11 +266,11 @@ private: @return an any */ template< class C > -inline Any SAL_CALL makeAny( const C & value ) SAL_THROW( () ); +inline Any SAL_CALL makeAny( const C & value ) SAL_THROW(()); // additionally specialized for C++ bool template<> -inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW( () ); +inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW(()); class BaseReference; class Type; @@ -282,11 +282,11 @@ class Type; @param value source value (right side) */ template< class C > -inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW( () ); +inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(()); // additionally for C++ bool: inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) - SAL_THROW( () ); + SAL_THROW(()); /** Template binary >>= operator to assign a value from an any. If the any does not contain a value that can be assigned without data loss, then this @@ -298,7 +298,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) @return true if assignment was possible without data loss */ template< class C > -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(()); /** Template equality operator: compares set value of left side any to right side value. The values need not be of equal type, e.g. a short integer is compared to a long integer. @@ -311,7 +311,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW( @return true if values are equal, false otherwise */ template< class C > -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW(()); /** Template unequality operator: compares set value of left side any to right side value. The values need not be of equal type, e.g. a short integer is compared to a long integer. This operator can be implemented as template member function, if all supported compilers @@ -323,43 +323,43 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_T @return true if values are unequal, false otherwise */ template< class C > -inline sal_Bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW(()); // additional specialized >>= and == operators // bool -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Bool & value ) SAL_THROW( () ); -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Bool & value ) SAL_THROW(()); +inline sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(()); template<> inline sal_Bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) - SAL_THROW( () ); + SAL_THROW(()); template<> inline sal_Bool SAL_CALL operator == ( Any const & rAny, bool const & value ) - SAL_THROW( () ); + SAL_THROW(()); // byte -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int8 & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int8 & value ) SAL_THROW(()); // short -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW( () ); -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(()); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(()); // long -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW( () ); -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(()); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(()); // hyper -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW( () ); -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(()); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(()); // float -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(()); // double -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(()); // string -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW( () ); -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(()); +inline sal_Bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(()); // type -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW( () ); -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(()); +inline sal_Bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(()); // any -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(()); // interface -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW( () ); +inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(()); } } @@ -375,7 +375,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & v @return type of IDL type any */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Any * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Any * ) SAL_THROW(()) { return ::cppu::UnoType< ::com::sun::star::uno::Any >::get(); } diff --git a/cppu/inc/com/sun/star/uno/Any.hxx b/cppu/inc/com/sun/star/uno/Any.hxx index 8ea8c437dde2..56a782e37fd0 100644 --- a/cppu/inc/com/sun/star/uno/Any.hxx +++ b/cppu/inc/com/sun/star/uno/Any.hxx @@ -45,7 +45,7 @@ namespace uno { //__________________________________________________________________________________________________ -inline Any::Any() SAL_THROW( () ) +inline Any::Any() SAL_THROW(()) { ::uno_any_construct( this, 0, 0, (uno_AcquireFunc)cpp_acquire ); } @@ -69,37 +69,37 @@ inline Any::Any( bool value ) } //__________________________________________________________________________________________________ -inline Any::Any( const Any & rAny ) SAL_THROW( () ) +inline Any::Any( const Any & rAny ) SAL_THROW(()) { ::uno_type_any_construct( this, rAny.pData, rAny.pType, (uno_AcquireFunc)cpp_acquire ); } //__________________________________________________________________________________________________ -inline Any::Any( const void * pData_, const Type & rType ) SAL_THROW( () ) +inline Any::Any( const void * pData_, const Type & rType ) SAL_THROW(()) { ::uno_type_any_construct( this, const_cast< void * >( pData_ ), rType.getTypeLibType(), (uno_AcquireFunc)cpp_acquire ); } //__________________________________________________________________________________________________ -inline Any::Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) +inline Any::Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) { ::uno_any_construct( this, const_cast< void * >( pData_ ), pTypeDescr, (uno_AcquireFunc)cpp_acquire ); } //__________________________________________________________________________________________________ -inline Any::Any( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW( () ) +inline Any::Any( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW(()) { ::uno_type_any_construct( this, const_cast< void * >( pData_ ), pType_, (uno_AcquireFunc)cpp_acquire ); } //__________________________________________________________________________________________________ -inline Any::~Any() SAL_THROW( () ) +inline Any::~Any() SAL_THROW(()) { ::uno_any_destruct( this, (uno_ReleaseFunc)cpp_release ); } //__________________________________________________________________________________________________ -inline Any & Any::operator = ( const Any & rAny ) SAL_THROW( () ) +inline Any & Any::operator = ( const Any & rAny ) SAL_THROW(()) { if (this != &rAny) { @@ -110,39 +110,39 @@ inline Any & Any::operator = ( const Any & rAny ) SAL_THROW( () ) return *this; } //__________________________________________________________________________________________________ -inline ::rtl::OUString Any::getValueTypeName() const SAL_THROW( () ) +inline ::rtl::OUString Any::getValueTypeName() const SAL_THROW(()) { return ::rtl::OUString( pType->pTypeName ); } //__________________________________________________________________________________________________ -inline void Any::setValue( const void * pData_, const Type & rType ) SAL_THROW( () ) +inline void Any::setValue( const void * pData_, const Type & rType ) SAL_THROW(()) { ::uno_type_any_assign( this, const_cast< void * >( pData_ ), rType.getTypeLibType(), (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); } //__________________________________________________________________________________________________ -inline void Any::setValue( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW( () ) +inline void Any::setValue( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW(()) { ::uno_type_any_assign( this, const_cast< void * >( pData_ ), pType_, (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); } //__________________________________________________________________________________________________ -inline void Any::setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) +inline void Any::setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) { ::uno_any_assign( this, const_cast< void * >( pData_ ), pTypeDescr, (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); } //__________________________________________________________________________________________________ -inline void Any::clear() SAL_THROW( () ) +inline void Any::clear() SAL_THROW(()) { ::uno_any_clear( this, (uno_ReleaseFunc)cpp_release ); } //__________________________________________________________________________________________________ -inline sal_Bool Any::isExtractableTo( const Type & rType ) const SAL_THROW( () ) +inline sal_Bool Any::isExtractableTo( const Type & rType ) const SAL_THROW(()) { return ::uno_type_isAssignableFromData( rType.getTypeLibType(), pData, pType, @@ -166,14 +166,14 @@ bool Any::has<sal_uInt16>() const; #endif // ! defined(__SUNPRO_CC) //__________________________________________________________________________________________________ -inline sal_Bool Any::operator == ( const Any & rAny ) const SAL_THROW( () ) +inline sal_Bool Any::operator == ( const Any & rAny ) const SAL_THROW(()) { return ::uno_type_equalData( pData, pType, rAny.pData, rAny.pType, (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release ); } //__________________________________________________________________________________________________ -inline sal_Bool Any::operator != ( const Any & rAny ) const SAL_THROW( () ) +inline sal_Bool Any::operator != ( const Any & rAny ) const SAL_THROW(()) { return (! ::uno_type_equalData( pData, pType, rAny.pData, rAny.pType, @@ -182,7 +182,7 @@ inline sal_Bool Any::operator != ( const Any & rAny ) const SAL_THROW( () ) //__________________________________________________________________________________________________ template< class C > -inline Any SAL_CALL makeAny( const C & value ) SAL_THROW( () ) +inline Any SAL_CALL makeAny( const C & value ) SAL_THROW(()) { return Any( &value, ::cppu::getTypeFavourUnsigned(&value) ); } @@ -190,7 +190,7 @@ inline Any SAL_CALL makeAny( const C & value ) SAL_THROW( () ) // additionally specialized for C++ bool //______________________________________________________________________________ template<> -inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW( () ) +inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW(()) { const sal_Bool b = value; return Any( &b, ::getCppuBooleanType() ); @@ -198,7 +198,7 @@ inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW( () ) //__________________________________________________________________________________________________ template< class C > -inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW( () ) +inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(()) { const Type & rType = ::cppu::getTypeFavourUnsigned(&value); ::uno_type_any_assign( @@ -209,7 +209,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW( () // additionally for C++ bool: //______________________________________________________________________________ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) - SAL_THROW( () ) + SAL_THROW(()) { sal_Bool b = value; ::uno_type_any_assign( @@ -219,7 +219,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) //__________________________________________________________________________________________________ template< class C > -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(()) { const Type & rType = ::cppu::getTypeFavourUnsigned(&value); return ::uno_type_assignData( @@ -231,7 +231,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW( // bool //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value ) SAL_THROW(()) { if (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass) { @@ -241,7 +241,7 @@ inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, return sal_False; } //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(()) { return (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass && (value != sal_False) == (* reinterpret_cast< const sal_Bool * >( rAny.pData ) != sal_False)); @@ -250,7 +250,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value //______________________________________________________________________________ template<> inline sal_Bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) - SAL_THROW( () ) + SAL_THROW(()) { if (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN) { @@ -264,7 +264,7 @@ inline sal_Bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) //______________________________________________________________________________ template<> inline sal_Bool SAL_CALL operator == ( Any const & rAny, bool const & value ) - SAL_THROW( () ) + SAL_THROW(()) { return (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN && (value == @@ -274,7 +274,7 @@ inline sal_Bool SAL_CALL operator == ( Any const & rAny, bool const & value ) // byte //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value ) SAL_THROW(()) { if (typelib_TypeClass_BYTE == rAny.pType->eTypeClass) { @@ -285,7 +285,7 @@ inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, } // short //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(()) { switch (rAny.pType->eTypeClass) { @@ -301,7 +301,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SA } } //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(()) { switch (rAny.pType->eTypeClass) { @@ -318,7 +318,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) S } // long //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(()) { switch (rAny.pType->eTypeClass) { @@ -340,7 +340,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SA } } //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(()) { switch (rAny.pType->eTypeClass) { @@ -363,7 +363,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) S } // hyper //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(()) { switch (rAny.pType->eTypeClass) { @@ -391,7 +391,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SA } } //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(()) { switch (rAny.pType->eTypeClass) { @@ -420,7 +420,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) S } // float //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(()) { switch (rAny.pType->eTypeClass) { @@ -442,7 +442,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_TH } // double //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(()) { switch (rAny.pType->eTypeClass) { @@ -473,7 +473,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_T } // string //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(()) { if (typelib_TypeClass_STRING == rAny.pType->eTypeClass) { @@ -483,14 +483,14 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & valu return sal_False; } //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(()) { return (typelib_TypeClass_STRING == rAny.pType->eTypeClass && value.equals( * reinterpret_cast< const ::rtl::OUString * >( rAny.pData ) )); } // type //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(()) { if (typelib_TypeClass_TYPE == rAny.pType->eTypeClass) { @@ -500,14 +500,14 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THR return sal_False; } //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(()) { return (typelib_TypeClass_TYPE == rAny.pType->eTypeClass && value.equals( * reinterpret_cast< const Type * >( rAny.pData ) )); } // any //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(()) { if (&rAny != &value) { @@ -519,7 +519,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THRO } // interface //__________________________________________________________________________________________________ -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(()) { if (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass) { @@ -531,7 +531,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & v // operator to compare to an any. //__________________________________________________________________________________________________ template< class C > -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW(()) { const Type & rType = ::cppu::getTypeFavourUnsigned(&value); return ::uno_type_equalData( @@ -542,7 +542,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_T // operator to compare to an any. may use specialized operators ==. //__________________________________________________________________________________________________ template< class C > -inline sal_Bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW( () ) +inline sal_Bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW(()) { return (! operator == ( rAny, value )); } diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h index 72aecfca323b..7e75a657e66f 100644 --- a/cppu/inc/com/sun/star/uno/Reference.h +++ b/cppu/inc/com/sun/star/uno/Reference.h @@ -92,14 +92,14 @@ public: @return UNacquired interface pointer */ - inline XInterface * SAL_CALL get() const SAL_THROW( () ) + inline XInterface * SAL_CALL get() const SAL_THROW(()) { return _pInterface; } /** Checks if reference is null. @return true if reference acquires an interface, i.e. true if it is not null */ - inline sal_Bool SAL_CALL is() const SAL_THROW( () ) + inline sal_Bool SAL_CALL is() const SAL_THROW(()) { return (0 != _pInterface); } /** Equality operator: compares two interfaces @@ -108,14 +108,14 @@ public: @param rRef another interface @return true if both references are null or refer to the same object, false otherwise */ - inline sal_Bool SAL_CALL operator == ( XInterface * pInterface ) const SAL_THROW( () ); + inline sal_Bool SAL_CALL operator == ( XInterface * pInterface ) const SAL_THROW(()); /** Unequality operator: compares two interfaces Checks if both references are null or refer to the same object. @param rRef another interface @return false if both references are null or refer to the same object, true otherwise */ - inline sal_Bool SAL_CALL operator != ( XInterface * pInterface ) const SAL_THROW( () ); + inline sal_Bool SAL_CALL operator != ( XInterface * pInterface ) const SAL_THROW(()); /** Equality operator: compares two interfaces Checks if both references are null or refer to the same object. @@ -123,21 +123,21 @@ public: @param rRef another reference @return true if both references are null or refer to the same object, false otherwise */ - inline sal_Bool SAL_CALL operator == ( const BaseReference & rRef ) const SAL_THROW( () ); + inline sal_Bool SAL_CALL operator == ( const BaseReference & rRef ) const SAL_THROW(()); /** Unequality operator: compares two interfaces Checks if both references are null or refer to the same object. @param rRef another reference @return false if both references are null or refer to the same object, true otherwise */ - inline sal_Bool SAL_CALL operator != ( const BaseReference & rRef ) const SAL_THROW( () ); + inline sal_Bool SAL_CALL operator != ( const BaseReference & rRef ) const SAL_THROW(()); /** Needed by some STL containers. @param rRef another reference @return true, if this reference is less than rRef */ - inline sal_Bool SAL_CALL operator < ( const BaseReference & rRef ) const SAL_THROW( () ); + inline sal_Bool SAL_CALL operator < ( const BaseReference & rRef ) const SAL_THROW(()); }; /** Enum defining UNO_QUERY for implicit interface query. @@ -234,41 +234,41 @@ class Reference : public BaseReference public: /// @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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(()) {} /// @endcond /** Destructor: Releases interface if set. */ - inline ~Reference() SAL_THROW( () ); + inline ~Reference() SAL_THROW(()); /** Default Constructor: Sets null reference. */ - inline Reference() SAL_THROW( () ); + inline Reference() SAL_THROW(()); /** Copy constructor: Copies interface reference. @param rRef another reference */ - inline Reference( const Reference< interface_type > & rRef ) SAL_THROW( () ); + inline Reference( const Reference< interface_type > & rRef ) SAL_THROW(()); /** Constructor: Sets given interface pointer. @param pInterface an interface pointer */ - inline Reference( interface_type * pInterface ) SAL_THROW( () ); + inline Reference( interface_type * pInterface ) SAL_THROW(()); /** Constructor: Sets given interface pointer without acquiring it. @param pInterface another reference @param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors */ - inline Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW( () ); + inline Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()); /** Constructor: Sets given interface pointer without acquiring it. Deprecated, please use SAL_NO_ACQUIRE version. @@ -276,7 +276,7 @@ public: @param pInterface another reference @param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to other constructors */ - inline Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () ); + inline Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()); /** Constructor: Queries given interface for reference interface type (interface_type). @@ -345,39 +345,39 @@ public: any interface must be derived from com.sun.star.uno.XInterface. This a useful direct cast possibility. */ - inline SAL_CALL operator const Reference< XInterface > & () const SAL_THROW( () ) + inline SAL_CALL operator const Reference< XInterface > & () const SAL_THROW(()) { return * reinterpret_cast< const Reference< XInterface > * >( this ); } /** Dereference operator: Used to call interface methods. @return UNacquired interface pointer */ - inline interface_type * SAL_CALL operator -> () const SAL_THROW( () ) + inline interface_type * SAL_CALL operator -> () const SAL_THROW(()) { return castFromXInterface(_pInterface); } /** Gets interface pointer. This call does not acquire the interface. @return UNacquired interface pointer */ - inline interface_type * SAL_CALL get() const SAL_THROW( () ) + inline interface_type * SAL_CALL get() const SAL_THROW(()) { return castFromXInterface(_pInterface); } /** Clears reference, i.e. releases interface. Reference is null after clear() call. */ - inline void SAL_CALL clear() SAL_THROW( () ); + inline void SAL_CALL clear() SAL_THROW(()); /** Sets the given interface. An interface already set will be released. @param rRef another reference @return true, if non-null interface was set */ - inline sal_Bool SAL_CALL set( const Reference< interface_type > & rRef ) SAL_THROW( () ); + inline sal_Bool SAL_CALL set( const Reference< interface_type > & rRef ) SAL_THROW(()); /** Sets the given interface. An interface already set will be released. @param pInterface another interface @return true, if non-null interface was set */ - inline sal_Bool SAL_CALL set( interface_type * pInterface ) SAL_THROW( () ); + inline sal_Bool SAL_CALL set( interface_type * pInterface ) SAL_THROW(()); /** Sets interface pointer without acquiring it. An interface already set will be released. @@ -385,7 +385,7 @@ public: @param dummy SAL_NO_ACQUIRE to force obvious distinction to set methods @return true, if non-null interface was set */ - inline sal_Bool SAL_CALL set( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW( () ); + inline sal_Bool SAL_CALL set( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()); /** Sets interface pointer without acquiring it. An interface already set will be released. Deprecated, please use SAL_NO_ACQUIRE version. @@ -394,7 +394,7 @@ public: @param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to set methods @return true, if non-null interface was set */ - inline sal_Bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () ); + inline sal_Bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()); /** Queries given interface for reference interface type (interface_type) and sets it. An interface already set will be released. @@ -485,14 +485,14 @@ public: @param pInterface an interface pointer @return this reference */ - inline Reference< interface_type > & SAL_CALL operator = ( interface_type * pInterface ) SAL_THROW( () ); + inline Reference< interface_type > & SAL_CALL operator = ( interface_type * pInterface ) SAL_THROW(()); /** Assignment operator: Acquires given interface reference and sets reference. An interface already set will be released. @param rRef an interface reference @return this reference */ - inline Reference< interface_type > & SAL_CALL operator = ( const Reference< interface_type > & rRef ) SAL_THROW( () ); + inline Reference< interface_type > & SAL_CALL operator = ( const Reference< interface_type > & rRef ) SAL_THROW(()); /** Queries given interface reference for type interface_type. diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx index 39e9614f20d8..19e9fbb9f686 100644 --- a/cppu/inc/com/sun/star/uno/Reference.hxx +++ b/cppu/inc/com/sun/star/uno/Reference.hxx @@ -111,20 +111,20 @@ inline interface_type * Reference< interface_type >::iset_throw( //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::~Reference() SAL_THROW( () ) +inline Reference< interface_type >::~Reference() SAL_THROW(()) { if (_pInterface) _pInterface->release(); } //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference() SAL_THROW( () ) +inline Reference< interface_type >::Reference() SAL_THROW(()) { _pInterface = 0; } //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef ) SAL_THROW( () ) +inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef ) SAL_THROW(()) { _pInterface = rRef._pInterface; if (_pInterface) @@ -132,7 +132,7 @@ inline Reference< interface_type >::Reference( const Reference< interface_type > } //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL_THROW( () ) +inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL_THROW(()) { _pInterface = castToXInterface(pInterface); if (_pInterface) @@ -140,13 +140,13 @@ inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL } //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW( () ) +inline Reference< interface_type >::Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()) { _pInterface = castToXInterface(pInterface); } //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () ) +inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()) { _pInterface = castToXInterface(pInterface); } @@ -205,7 +205,7 @@ inline Reference< interface_type >::Reference( interface_type * pInterface, UnoR //__________________________________________________________________________________________________ template< class interface_type > -inline void Reference< interface_type >::clear() SAL_THROW( () ) +inline void Reference< interface_type >::clear() SAL_THROW(()) { if (_pInterface) { @@ -217,7 +217,7 @@ inline void Reference< interface_type >::clear() SAL_THROW( () ) //__________________________________________________________________________________________________ template< class interface_type > inline sal_Bool Reference< interface_type >::set( - interface_type * pInterface ) SAL_THROW( () ) + interface_type * pInterface ) SAL_THROW(()) { if (pInterface) castToXInterface(pInterface)->acquire(); @@ -230,7 +230,7 @@ inline sal_Bool Reference< interface_type >::set( //__________________________________________________________________________________________________ template< class interface_type > inline sal_Bool Reference< interface_type >::set( - interface_type * pInterface, __sal_NoAcquire ) SAL_THROW( () ) + interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()) { XInterface * const pOld = _pInterface; _pInterface = castToXInterface(pInterface); @@ -241,7 +241,7 @@ inline sal_Bool Reference< interface_type >::set( //__________________________________________________________________________________________________ template< class interface_type > inline sal_Bool Reference< interface_type >::set( - interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () ) + interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()) { return set( pInterface, SAL_NO_ACQUIRE ); } @@ -249,7 +249,7 @@ inline sal_Bool Reference< interface_type >::set( //__________________________________________________________________________________________________ template< class interface_type > inline sal_Bool Reference< interface_type >::set( - const Reference< interface_type > & rRef ) SAL_THROW( () ) + const Reference< interface_type > & rRef ) SAL_THROW(()) { return set( castFromXInterface( rRef._pInterface ) ); } @@ -328,7 +328,7 @@ inline void Reference< interface_type >::set( //__________________________________________________________________________________________________ template< class interface_type > inline Reference< interface_type > & Reference< interface_type >::operator = ( - interface_type * pInterface ) SAL_THROW( () ) + interface_type * pInterface ) SAL_THROW(()) { set( pInterface ); return *this; @@ -336,7 +336,7 @@ inline Reference< interface_type > & Reference< interface_type >::operator = ( //__________________________________________________________________________________________________ template< class interface_type > inline Reference< interface_type > & Reference< interface_type >::operator = ( - const Reference< interface_type > & rRef ) SAL_THROW( () ) + const Reference< interface_type > & rRef ) SAL_THROW(()) { set( castFromXInterface( rRef._pInterface ) ); return *this; @@ -362,7 +362,7 @@ inline Reference< interface_type > Reference< interface_type >::query( //################################################################################################## //__________________________________________________________________________________________________ -inline sal_Bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THROW( () ) +inline sal_Bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THROW(()) { if (_pInterface == pInterface) return sal_True; @@ -385,7 +385,7 @@ inline sal_Bool BaseReference::operator == ( XInterface * pInterface ) const SAL //______________________________________________________________________________ inline sal_Bool BaseReference::operator < ( - const BaseReference & rRef ) const SAL_THROW( () ) + const BaseReference & rRef ) const SAL_THROW(()) { if (_pInterface == rRef._pInterface) return sal_False; @@ -407,17 +407,17 @@ inline sal_Bool BaseReference::operator < ( } //__________________________________________________________________________________________________ -inline sal_Bool BaseReference::operator != ( XInterface * pInterface ) const SAL_THROW( () ) +inline sal_Bool BaseReference::operator != ( XInterface * pInterface ) const SAL_THROW(()) { return (! operator == ( pInterface )); } //__________________________________________________________________________________________________ -inline sal_Bool BaseReference::operator == ( const BaseReference & rRef ) const SAL_THROW( () ) +inline sal_Bool BaseReference::operator == ( const BaseReference & rRef ) const SAL_THROW(()) { return operator == ( rRef._pInterface ); } //__________________________________________________________________________________________________ -inline sal_Bool BaseReference::operator != ( const BaseReference & rRef ) const SAL_THROW( () ) +inline sal_Bool BaseReference::operator != ( const BaseReference & rRef ) const SAL_THROW(()) { return (! operator == ( rRef._pInterface )); } diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h index 13a4bf008352..f12b7c1e3b7b 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.h +++ b/cppu/inc/com/sun/star/uno/Sequence.h @@ -71,16 +71,16 @@ public: // these are here to force memory de/allocation to sal lib. inline static void * SAL_CALL operator new ( ::size_t nSize ) - SAL_THROW( () ) + SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } inline static void SAL_CALL operator delete ( void * pMem ) - SAL_THROW( () ) + SAL_THROW(()) { ::rtl_freeMemory( pMem ); } inline static void * SAL_CALL operator new ( ::size_t, void * pMem ) - SAL_THROW( () ) + SAL_THROW(()) { return pMem; } inline static void SAL_CALL operator delete ( void *, void * ) - SAL_THROW( () ) + SAL_THROW(()) {} /** Static pointer to typelib type of sequence. @@ -96,13 +96,13 @@ public: /** Default constructor: Creates an empty sequence. */ - inline Sequence() SAL_THROW( () ); + inline Sequence() SAL_THROW(()); /** Copy constructor: Creates a copy of given sequence. @param rSeq another sequence of same type */ - inline Sequence( const Sequence< E > & rSeq ) SAL_THROW( () ); + inline Sequence( const Sequence< E > & rSeq ) SAL_THROW(()); /** Constructor: Takes over ownership of given sequence. @@ -111,7 +111,7 @@ public: constructors */ inline Sequence( uno_Sequence * pSequence, __sal_NoAcquire ) - SAL_THROW( () ); + SAL_THROW(()); /** Constructor: Creates a copy of given elements. @@ -129,7 +129,7 @@ public: /** Destructor: Releases sequence handle. Last handle will destruct elements and free memory. */ - inline ~Sequence() SAL_THROW( () ); + inline ~Sequence() SAL_THROW(()); /** Assignment operator: Acquires given sequence handle and releases previously set handle. @@ -138,13 +138,13 @@ public: @return this sequence */ inline Sequence< E > & SAL_CALL operator = ( const Sequence< E > & rSeq ) - SAL_THROW( () ); + SAL_THROW(()); /** Gets length of the sequence. @return length of sequence */ - inline sal_Int32 SAL_CALL getLength() const SAL_THROW( () ) + inline sal_Int32 SAL_CALL getLength() const SAL_THROW(()) { return _pSequence->nElements; } /** Tests whether the sequence has elements, i.e. elements count is @@ -152,7 +152,7 @@ public: @return true, if elements count is greater than zero */ - inline sal_Bool SAL_CALL hasElements() const SAL_THROW( () ) + inline sal_Bool SAL_CALL hasElements() const SAL_THROW(()) { return (_pSequence->nElements > 0); } /** Gets a pointer to elements array for reading. @@ -161,7 +161,7 @@ public: @return pointer to elements array */ - inline const E * SAL_CALL getConstArray() const SAL_THROW( () ) + inline const E * SAL_CALL getConstArray() const SAL_THROW(()) { return reinterpret_cast< const E * >( _pSequence->elements ); } /** Gets a pointer to elements array for reading and writing. @@ -194,7 +194,7 @@ public: @return const C++ reference to element */ inline const E & SAL_CALL operator [] ( sal_Int32 nIndex ) const - SAL_THROW( () ); + SAL_THROW(()); /** Equality operator: Compares two sequences. @@ -202,7 +202,7 @@ public: @return true if both sequences are equal, false otherwise */ inline sal_Bool SAL_CALL operator == ( const Sequence< E > & rSeq ) const - SAL_THROW( () ); + SAL_THROW(()); /** Unequality operator: Compares two sequences. @@ -210,7 +210,7 @@ public: @return false if both sequences are equal, true otherwise */ inline sal_Bool SAL_CALL operator != ( const Sequence< E > & rSeq ) const - SAL_THROW( () ); + SAL_THROW(()); /** Reallocates sequence to new length. If the new length is smaller than the former, then upper elements will @@ -228,7 +228,7 @@ public: @return UNacquired sequence handle */ - inline uno_Sequence * SAL_CALL get() const SAL_THROW( () ) + inline uno_Sequence * SAL_CALL get() const SAL_THROW(()) { return _pSequence; } }; @@ -238,7 +238,7 @@ public: @return a UNO byte sequence */ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence( - const ::rtl::ByteSequence & rByteSequence ) SAL_THROW( () ); + const ::rtl::ByteSequence & rByteSequence ) SAL_THROW(()); } } @@ -258,7 +258,7 @@ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence( template< class E > inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * ) - SAL_THROW( () ); + SAL_THROW(()); /** Gets the meta type of IDL sequence. This function has been introduced, because one cannot get the (templated) @@ -274,7 +274,7 @@ SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * ) template< class E > inline const ::com::sun::star::uno::Type & SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType ) - SAL_THROW( () ); + SAL_THROW(()); /** Gets the meta type of IDL sequence< char >. This function has been introduced due to ambiguities with unsigned short. @@ -284,7 +284,7 @@ SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType ) @return type of IDL sequence< char > */ inline const ::com::sun::star::uno::Type & -SAL_CALL getCharSequenceCppuType() SAL_THROW( () ); +SAL_CALL getCharSequenceCppuType() SAL_THROW(()); #endif diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx index c8907d34e6bd..4d3e44a378f9 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.hxx +++ b/cppu/inc/com/sun/star/uno/Sequence.hxx @@ -52,7 +52,7 @@ typelib_TypeDescriptionReference * Sequence< E >::s_pType = 0; //______________________________________________________________________________ template< class E > -inline Sequence< E >::Sequence() SAL_THROW( () ) +inline Sequence< E >::Sequence() SAL_THROW(()) { const Type & rType = ::cppu::getTypeFavourUnsigned( this ); ::uno_type_sequence_construct( @@ -63,7 +63,7 @@ inline Sequence< E >::Sequence() SAL_THROW( () ) //______________________________________________________________________________ template< class E > -inline Sequence< E >::Sequence( const Sequence< E > & rSeq ) SAL_THROW( () ) +inline Sequence< E >::Sequence( const Sequence< E > & rSeq ) SAL_THROW(()) { ::osl_incrementInterlockedCount( &rSeq._pSequence->nRefCount ); _pSequence = rSeq._pSequence; @@ -72,7 +72,7 @@ inline Sequence< E >::Sequence( const Sequence< E > & rSeq ) SAL_THROW( () ) //______________________________________________________________________________ template< class E > inline Sequence< E >::Sequence( - uno_Sequence * pSequence, __sal_NoAcquire ) SAL_THROW( () ) + uno_Sequence * pSequence, __sal_NoAcquire ) SAL_THROW(()) : _pSequence( pSequence ) { } @@ -113,7 +113,7 @@ inline Sequence< E >::Sequence( sal_Int32 len ) //______________________________________________________________________________ template< class E > -inline Sequence< E >::~Sequence() SAL_THROW( () ) +inline Sequence< E >::~Sequence() SAL_THROW(()) { const Type & rType = ::cppu::getTypeFavourUnsigned( this ); ::uno_type_destructData( @@ -122,7 +122,7 @@ inline Sequence< E >::~Sequence() SAL_THROW( () ) //______________________________________________________________________________ template< class E > -inline Sequence< E > & Sequence< E >::operator = ( const Sequence< E > & rSeq ) SAL_THROW( () ) +inline Sequence< E > & Sequence< E >::operator = ( const Sequence< E > & rSeq ) SAL_THROW(()) { const Type & rType = ::cppu::getTypeFavourUnsigned( this ); ::uno_type_sequence_assign( @@ -133,7 +133,7 @@ inline Sequence< E > & Sequence< E >::operator = ( const Sequence< E > & rSeq ) //______________________________________________________________________________ template< class E > inline sal_Bool Sequence< E >::operator == ( const Sequence< E > & rSeq ) const - SAL_THROW( () ) + SAL_THROW(()) { if (_pSequence == rSeq._pSequence) return sal_True; @@ -148,7 +148,7 @@ inline sal_Bool Sequence< E >::operator == ( const Sequence< E > & rSeq ) const //______________________________________________________________________________ template< class E > inline sal_Bool Sequence< E >::operator != ( const Sequence< E > & rSeq ) const - SAL_THROW( () ) + SAL_THROW(()) { return (! operator == ( rSeq )); } @@ -184,7 +184,7 @@ inline E & Sequence< E >::operator [] ( sal_Int32 nIndex ) //______________________________________________________________________________ template< class E > inline const E & Sequence< E >::operator [] ( sal_Int32 nIndex ) const - SAL_THROW( () ) + SAL_THROW(()) { OSL_ENSURE( nIndex >= 0 && nIndex < getLength(), @@ -211,7 +211,7 @@ inline void Sequence< E >::realloc( sal_Int32 nSize ) //------------------------------------------------------------------------------ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence( - const ::rtl::ByteSequence & rByteSequence ) SAL_THROW( () ) + const ::rtl::ByteSequence & rByteSequence ) SAL_THROW(()) { return ::com::sun::star::uno::Sequence< sal_Int8 >( * reinterpret_cast< const ::com::sun::star::uno::Sequence< sal_Int8 > * >( &rByteSequence ) ); @@ -267,7 +267,7 @@ template< class E > inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Sequence< E > * ) - SAL_THROW( () ) + SAL_THROW(()) { return ::cppu::getTypeFavourUnsigned( static_cast< ::com::sun::star::uno::Sequence< E > * >(0)); @@ -277,7 +277,7 @@ SAL_CALL getCppuType( template< class E > inline const ::com::sun::star::uno::Type & SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType ) - SAL_THROW( () ) + SAL_THROW(()) { if (! ::com::sun::star::uno::Sequence< E >::s_pType) { @@ -295,7 +295,7 @@ static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char // char sequence inline const ::com::sun::star::uno::Type & -SAL_CALL getCharSequenceCppuType() SAL_THROW( () ) +SAL_CALL getCharSequenceCppuType() SAL_THROW(()) { #if !( defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0; diff --git a/cppu/inc/com/sun/star/uno/Type.h b/cppu/inc/com/sun/star/uno/Type.h index 2072d6accc82..e11551e864d2 100644 --- a/cppu/inc/com/sun/star/uno/Type.h +++ b/cppu/inc/com/sun/star/uno/Type.h @@ -72,39 +72,39 @@ class Type public: /// @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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(()) {} /// @endcond /** Default Constructor: Type is set to void. */ - inline Type() SAL_THROW( () ); + inline Type() SAL_THROW(()); /** Constructor: Type is constructed by given name and type class. @param eTypeClass type class of type @param rTypeName name of type */ - inline Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW( () ); + inline Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW(()); /** Constructor: Type is constructed by given name and type class. @param eTypeClass type class of type @param pTypeName name of type */ - inline Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW( () ); + inline Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW(()); /** Constructor: Type is (copy) constructed by given C type description reference. @param pType C type description reference */ - inline Type( typelib_TypeDescriptionReference * pType ) SAL_THROW( () ); + inline Type( typelib_TypeDescriptionReference * pType ) SAL_THROW(()); /** Constructor: Type is (copy) constructed by given C type description reference without acquiring it. @@ -112,24 +112,24 @@ public: @param pType C type description reference @param dummy UNO_TYPE_NO_ACQUIRE to force obvious distinction to other constructors */ - inline Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW( () ); + inline Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW(()); /** Constructor: Type is (copy) constructed by given C type description reference without acquiring it. @param pType C type description reference @param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors */ - inline Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW( () ); + inline Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW(()); /** Copy constructor: Type is copy constructed by given type. @param rType another type */ - inline Type( const Type & rType ) SAL_THROW( () ); + inline Type( const Type & rType ) SAL_THROW(()); /** Destructor: Releases acquired C type description reference. */ - inline ~Type() SAL_THROW( () ) + inline ~Type() SAL_THROW(()) { ::typelib_typedescriptionreference_release( _pType ); } /** Assignment operator: Acquires right side type and releases previously set type. @@ -137,33 +137,33 @@ public: @param rType another type (right side) @return this type */ - inline Type & SAL_CALL operator = ( const Type & rType ) SAL_THROW( () ); + inline Type & SAL_CALL operator = ( const Type & rType ) SAL_THROW(()); /** Gets the type class of set type. @return type class of set type */ - inline TypeClass SAL_CALL getTypeClass() const SAL_THROW( () ) + inline TypeClass SAL_CALL getTypeClass() const SAL_THROW(()) { return (TypeClass)_pType->eTypeClass; } /** Gets the name of the set type. @return name of the set type */ - inline ::rtl::OUString SAL_CALL getTypeName() const SAL_THROW( () ); + inline ::rtl::OUString SAL_CALL getTypeName() const SAL_THROW(()); /** Obtains a full type description of set type. @param ppDescr [inout] type description */ - inline void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const SAL_THROW( () ) + inline void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const SAL_THROW(()) { ::typelib_typedescriptionreference_getDescription( ppDescr, _pType ); } /** Gets the C typelib type description reference pointer. Does not acquire the reference! @return UNacquired type description reference */ - inline typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const SAL_THROW( () ) + inline typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const SAL_THROW(()) { return _pType; } /** Tests if values of this reflected type can be assigned by values of given type. @@ -174,7 +174,7 @@ public: @return true if values of this type can be assigned from values of given type, false otherwise */ - inline sal_Bool SAL_CALL isAssignableFrom( const Type & rType ) const SAL_THROW( () ) + inline sal_Bool SAL_CALL isAssignableFrom( const Type & rType ) const SAL_THROW(()) { return ::typelib_typedescriptionreference_isAssignableFrom( _pType, rType._pType ); } /** Compares two types. @@ -182,21 +182,21 @@ public: @param rType another type @return true if both types refer the same type, false otherwise */ - inline sal_Bool SAL_CALL equals( const Type & rType ) const SAL_THROW( () ) + inline sal_Bool SAL_CALL equals( const Type & rType ) const SAL_THROW(()) { return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); } /** Equality operator: Compares two types. @param rType another type @return true if both types refer the same type, false otherwise */ - inline sal_Bool SAL_CALL operator == ( const Type & rType ) const SAL_THROW( () ) + inline sal_Bool SAL_CALL operator == ( const Type & rType ) const SAL_THROW(()) { return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); } /** Unequality operator: Compares two types. @param rType another type @return false if both types refer the same type, true otherwise */ - inline sal_Bool SAL_CALL operator != ( const Type & rType ) const SAL_THROW( () ) + inline sal_Bool SAL_CALL operator != ( const Type & rType ) const SAL_THROW(()) { return (! ::typelib_typedescriptionreference_equals( _pType, rType._pType )); } }; @@ -223,28 +223,28 @@ public: @return type of IDL type "type" */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Type * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Type * ) SAL_THROW(()); /** Gets the meta type of IDL type void. @return type of IDL type void */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() SAL_THROW(()); /** Gets the meta type of IDL type void. @return type of IDL type void */ -inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() SAL_THROW(()); /** Gets the meta type of IDL type boolean. @return type of IDL type boolean */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() SAL_THROW(()); /** Gets the meta type of IDL type boolean. @return type of IDL type boolean */ -inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THROW(()); /** Gets the meta type of IDL type boolean. There are cases (involving templates) where uses of getCppuType are known to @@ -254,7 +254,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THR @return type of IDL type boolean */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW(()); /** Gets the meta type of IDL type boolean. There are cases (involving templates) where uses of getCppuType are known to @@ -265,18 +265,18 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool @return type of IDL type boolean */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( - bool const * ) SAL_THROW( () ); + bool const * ) SAL_THROW(()); /** Gets the meta type of IDL type char. @return type of IDL type char */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType() SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType() SAL_THROW(()); /** Gets the meta type of IDL type char. @return type of IDL type char */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW(()); /** Gets the meta type of IDL type byte. @@ -287,7 +287,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( @return type of IDL type byte */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW(()); /** Gets the meta type of IDL type string. @@ -298,7 +298,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 @return type of IDL type string */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW(()); /** Gets the meta type of IDL type short. @@ -309,7 +309,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OU @return type of IDL type short */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW(()); /** Gets the meta type of IDL type unsigned short. @@ -320,7 +320,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 @return type of IDL type unsigned short */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW(()); /** Gets the meta type of IDL type long. @@ -331,7 +331,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt1 @return type of IDL type long */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW(()); /** Gets the meta type of IDL type unsigned long. @@ -342,7 +342,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 @return type of IDL type unsigned long */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW(()); /** Gets the meta type of IDL type hyper. @@ -353,7 +353,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt3 @return type of IDL type hyper */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW(()); /** Gets the meta type of IDL type unsigned hyper. @@ -364,7 +364,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 @return type of IDL type unsigned hyper */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW(()); /** Gets the meta type of IDL type float. @@ -375,7 +375,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt6 @return type of IDL type float */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW(()); /** Gets the meta type of IDL type double. @@ -386,7 +386,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) @return type of IDL type double */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW(()); /** Array template function to get meta type for one-dimensional arrays. @@ -394,42 +394,42 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * @return type of array */ template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) SAL_THROW(()); /** Array template function to get meta type for two-dimensional arrays. @param pT array pointer @return type of array */ template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) SAL_THROW(()); /** Array template function to get meta type for three-dimensional arrays. @param pT array pointer @return type of array */ template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) SAL_THROW(()); /** Array template function to get meta type for four-dimensional arrays. @param pT array pointer @return type of array */ template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) SAL_THROW(()); /** Array template function to get meta type for five-dimensional arrays. @param pT array pointer @return type of array */ template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) SAL_THROW(()); /** Array template function to get meta type for six-dimensional arrays. @param pT array pointer @return type of array */ template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType6( T * pT ) SAL_THROW( () ); +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType6( T * pT ) SAL_THROW(()); /** Gets the meta type of an IDL type. diff --git a/cppu/inc/com/sun/star/uno/Type.hxx b/cppu/inc/com/sun/star/uno/Type.hxx index 6b53d8192931..2313f6fc9af9 100644 --- a/cppu/inc/com/sun/star/uno/Type.hxx +++ b/cppu/inc/com/sun/star/uno/Type.hxx @@ -42,53 +42,53 @@ namespace uno { //__________________________________________________________________________________________________ -inline Type::Type() SAL_THROW( () ) +inline Type::Type() SAL_THROW(()) { _pType = reinterpret_cast< const ::com::sun::star::uno::Type * >( ::typelib_static_type_getByTypeClass( typelib_TypeClass_VOID ) )->getTypeLibType(); ::typelib_typedescriptionreference_acquire( _pType ); } //__________________________________________________________________________________________________ -inline Type::Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW( () ) +inline Type::Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW(()) : _pType( 0 ) { ::typelib_typedescriptionreference_new( &_pType, (typelib_TypeClass)eTypeClass, rTypeName.pData ); } //__________________________________________________________________________________________________ -inline Type::Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW( () ) +inline Type::Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW(()) : _pType( 0 ) { ::typelib_typedescriptionreference_newByAsciiName( &_pType, (typelib_TypeClass)eTypeClass, pTypeName ); } //__________________________________________________________________________________________________ -inline Type::Type( typelib_TypeDescriptionReference * pType ) SAL_THROW( () ) +inline Type::Type( typelib_TypeDescriptionReference * pType ) SAL_THROW(()) : _pType( pType ) { ::typelib_typedescriptionreference_acquire( _pType ); } //__________________________________________________________________________________________________ -inline Type::Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW( () ) +inline Type::Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW(()) : _pType( pType ) { } //__________________________________________________________________________________________________ -inline Type::Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW( () ) +inline Type::Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW(()) : _pType( pType ) { } //__________________________________________________________________________________________________ -inline Type::Type( const Type & rType ) SAL_THROW( () ) +inline Type::Type( const Type & rType ) SAL_THROW(()) : _pType( rType._pType ) { ::typelib_typedescriptionreference_acquire( _pType ); } //__________________________________________________________________________________________________ -inline ::rtl::OUString Type::getTypeName() const SAL_THROW( () ) +inline ::rtl::OUString Type::getTypeName() const SAL_THROW(()) { return ::rtl::OUString( _pType->pTypeName ); } //__________________________________________________________________________________________________ -inline Type & Type::operator = ( const Type & rType ) SAL_THROW( () ) +inline Type & Type::operator = ( const Type & rType ) SAL_THROW(()) { ::typelib_typedescriptionreference_assign( &_pType, rType._pType ); return *this; @@ -103,100 +103,100 @@ typelib_TypeDescriptionReference * Array< T >::s_pType = 0; } } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Type * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Type * ) SAL_THROW(()) { return ::cppu::UnoType< ::com::sun::star::uno::Type >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() SAL_THROW(()) { return ::cppu::UnoType< ::cppu::UnoVoidType >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() SAL_THROW(()) { return ::cppu::UnoType< ::cppu::UnoVoidType >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() SAL_THROW(()) { return ::cppu::UnoType< bool >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THROW(()) { return ::cppu::UnoType< bool >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Bool * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Bool * ) SAL_THROW(()) { return ::cppu::UnoType< bool >::get(); } inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( - SAL_UNUSED_PARAMETER bool const * ) SAL_THROW( () ) + SAL_UNUSED_PARAMETER bool const * ) SAL_THROW(()) { return ::cppu::UnoType< bool >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType() SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType() SAL_THROW(()) { return ::cppu::UnoType< ::cppu::UnoCharType >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW(()) { return ::cppu::UnoType< ::cppu::UnoCharType >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int8 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int8 * ) SAL_THROW(()) { return ::cppu::UnoType< ::sal_Int8 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::rtl::OUString * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::rtl::OUString * ) SAL_THROW(()) { return ::cppu::UnoType< ::rtl::OUString >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int16 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int16 * ) SAL_THROW(()) { return ::cppu::UnoType< ::sal_Int16 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt16 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt16 * ) SAL_THROW(()) { return ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int32 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int32 * ) SAL_THROW(()) { return ::cppu::UnoType< ::sal_Int32 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt32 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt32 * ) SAL_THROW(()) { return ::cppu::UnoType< ::sal_uInt32 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int64 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int64 * ) SAL_THROW(()) { return ::cppu::UnoType< ::sal_Int64 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt64 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt64 * ) SAL_THROW(()) { return ::cppu::UnoType< ::sal_uInt64 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const float * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const float * ) SAL_THROW(()) { return ::cppu::UnoType< float >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const double * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const double * ) SAL_THROW(()) { return ::cppu::UnoType< double >::get(); } template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) SAL_THROW(()) { if (! ::com::sun::star::uno::Array< T >::s_pType) { @@ -213,7 +213,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) } template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) SAL_THROW(()) { if (! ::com::sun::star::uno::Array< T >::s_pType) { @@ -231,7 +231,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) } template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) SAL_THROW(()) { if (! ::com::sun::star::uno::Array< T >::s_pType) { @@ -250,7 +250,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) } template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) SAL_THROW(()) { if (! ::com::sun::star::uno::Array< T >::s_pType) { @@ -270,7 +270,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) } template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) SAL_THROW(()) { if (! ::com::sun::star::uno::Array< T >::s_pType) { @@ -291,7 +291,7 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) } template< class T > -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType6( T * pT ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType6( T * pT ) SAL_THROW(()) { if (! ::com::sun::star::uno::Array< T >::s_pType) { diff --git a/cppu/inc/com/sun/star/uno/genfunc.h b/cppu/inc/com/sun/star/uno/genfunc.h index 1b0dbd2c4cce..0deb536f512e 100644 --- a/cppu/inc/com/sun/star/uno/genfunc.h +++ b/cppu/inc/com/sun/star/uno/genfunc.h @@ -46,13 +46,13 @@ namespace uno @param pCppI C++ interface pointer */ inline void SAL_CALL cpp_acquire( void * pCppI ) - SAL_THROW( () ); + SAL_THROW(()); /** Function to release a C++ interface. @param pCppI C++ interface pointer */ inline void SAL_CALL cpp_release( void * pCppI ) - SAL_THROW( () ); + SAL_THROW(()); /** Function to query for a C++ interface. @param pCppI C++ interface pointer @@ -60,7 +60,7 @@ inline void SAL_CALL cpp_release( void * pCppI ) @return acquired C++ interface pointer or null */ inline void * SAL_CALL cpp_queryInterface( void * pCppI, typelib_TypeDescriptionReference * pType ) - SAL_THROW( () ); + SAL_THROW(()); } } diff --git a/cppu/inc/com/sun/star/uno/genfunc.hxx b/cppu/inc/com/sun/star/uno/genfunc.hxx index 88234bd81389..ab9928de7632 100644 --- a/cppu/inc/com/sun/star/uno/genfunc.hxx +++ b/cppu/inc/com/sun/star/uno/genfunc.hxx @@ -43,19 +43,19 @@ namespace uno //================================================================================================== inline void SAL_CALL cpp_acquire( void * pCppI ) - SAL_THROW( () ) + SAL_THROW(()) { reinterpret_cast< XInterface * >( pCppI )->acquire(); } //================================================================================================== inline void SAL_CALL cpp_release( void * pCppI ) - SAL_THROW( () ) + SAL_THROW(()) { reinterpret_cast< XInterface * >( pCppI )->release(); } //================================================================================================== inline void * SAL_CALL cpp_queryInterface( void * pCppI, typelib_TypeDescriptionReference * pType ) - SAL_THROW( () ) + SAL_THROW(()) { if (pCppI) { diff --git a/cppu/inc/cppu/EnvGuards.hxx b/cppu/inc/cppu/EnvGuards.hxx index 07f65b2aced9..9279948e06b0 100644 --- a/cppu/inc/cppu/EnvGuards.hxx +++ b/cppu/inc/cppu/EnvGuards.hxx @@ -68,7 +68,7 @@ namespace cppu @return 0 == empty, 1 == non empty */ - sal_Bool SAL_CALL is() const SAL_THROW( () ) + sal_Bool SAL_CALL is() const SAL_THROW(()) { return m_env.is(); } diff --git a/cppu/inc/typelib/typedescription.hxx b/cppu/inc/typelib/typedescription.hxx index 2e3e72f5491d..dddea422116b 100644 --- a/cppu/inc/typelib/typedescription.hxx +++ b/cppu/inc/typelib/typedescription.hxx @@ -57,13 +57,13 @@ class TypeDescription public: /// @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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(()) {} /// @endcond @@ -71,48 +71,48 @@ public: @param pTypeDescr a type description */ - inline TypeDescription( typelib_TypeDescription * pTypeDescr = 0 ) SAL_THROW( () ); + inline TypeDescription( typelib_TypeDescription * pTypeDescr = 0 ) SAL_THROW(()); /** Constructor: @param pTypeDescrRef a type description reference */ - inline TypeDescription( typelib_TypeDescriptionReference * pTypeDescrRef ) SAL_THROW( () ); + inline TypeDescription( typelib_TypeDescriptionReference * pTypeDescrRef ) SAL_THROW(()); /** Constructor: @param rType a type */ - inline TypeDescription( const ::com::sun::star::uno::Type & rType ) SAL_THROW( () ); + inline TypeDescription( const ::com::sun::star::uno::Type & rType ) SAL_THROW(()); /** Copy constructor: @param rDescr another TypeDescription */ - inline TypeDescription( const TypeDescription & rDescr ) SAL_THROW( () ); + inline TypeDescription( const TypeDescription & rDescr ) SAL_THROW(()); /** Constructor: @param pTypeName a type name */ - inline TypeDescription( rtl_uString * pTypeName ) SAL_THROW( () ); + inline TypeDescription( rtl_uString * pTypeName ) SAL_THROW(()); /** Constructor: @param rTypeName a type name */ - inline TypeDescription( const ::rtl::OUString & rTypeName ) SAL_THROW( () ); + inline TypeDescription( const ::rtl::OUString & rTypeName ) SAL_THROW(()); /** Destructor: releases type description */ - inline ~TypeDescription() SAL_THROW( () ); + inline ~TypeDescription() SAL_THROW(()); /** Assignment operator: acquires given type description and releases a set one. @param pTypeDescr another type description @return this TypeDescription */ - inline TypeDescription & SAL_CALL operator = ( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ); + inline TypeDescription & SAL_CALL operator = ( typelib_TypeDescription * pTypeDescr ) SAL_THROW(()); /** Assignment operator: acquires given type description and releases a set one. @param rTypeDescr another type description @return this TypeDescription */ - inline TypeDescription & SAL_CALL operator =( const TypeDescription & rTypeDescr ) SAL_THROW( () ) + inline TypeDescription & SAL_CALL operator =( const TypeDescription & rTypeDescr ) SAL_THROW(()) { return this->operator =( rTypeDescr.get() ); } /** Tests whether two type descriptions are equal. @@ -120,80 +120,80 @@ public: @param pTypeDescr another type description @return true, if both type descriptions are equal, false otherwise */ - inline sal_Bool SAL_CALL equals( const typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () ); + inline sal_Bool SAL_CALL equals( const typelib_TypeDescription * pTypeDescr ) const SAL_THROW(()); /** Tests whether two type descriptions are equal. @param rTypeDescr another type description @return true, if both type descriptions are equal, false otherwise */ - inline sal_Bool SAL_CALL equals( const TypeDescription & rTypeDescr ) const SAL_THROW( () ) + inline sal_Bool SAL_CALL equals( const TypeDescription & rTypeDescr ) const SAL_THROW(()) { return equals( rTypeDescr._pTypeDescr ); } /** Makes stored type description complete. */ - inline void SAL_CALL makeComplete() const SAL_THROW( () ); + inline void SAL_CALL makeComplete() const SAL_THROW(()); /** Gets the UNacquired type description pointer. @return stored pointer of type description */ - inline typelib_TypeDescription * SAL_CALL get() const SAL_THROW( () ) + inline typelib_TypeDescription * SAL_CALL get() const SAL_THROW(()) { return _pTypeDescr; } /** Tests if a type description is set. @return true, if a type description is set, false otherwise */ - inline sal_Bool SAL_CALL is() const SAL_THROW( () ) + inline sal_Bool SAL_CALL is() const SAL_THROW(()) { return (_pTypeDescr != 0); } }; //__________________________________________________________________________________________________ -inline TypeDescription::TypeDescription( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) +inline TypeDescription::TypeDescription( typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) : _pTypeDescr( pTypeDescr ) { if (_pTypeDescr) typelib_typedescription_acquire( _pTypeDescr ); } //__________________________________________________________________________________________________ -inline TypeDescription::TypeDescription( typelib_TypeDescriptionReference * pTypeDescrRef ) SAL_THROW( () ) +inline TypeDescription::TypeDescription( typelib_TypeDescriptionReference * pTypeDescrRef ) SAL_THROW(()) : _pTypeDescr( 0 ) { if (pTypeDescrRef) typelib_typedescriptionreference_getDescription( &_pTypeDescr, pTypeDescrRef ); } //__________________________________________________________________________________________________ -inline TypeDescription::TypeDescription( const ::com::sun::star::uno::Type & rType ) SAL_THROW( () ) +inline TypeDescription::TypeDescription( const ::com::sun::star::uno::Type & rType ) SAL_THROW(()) : _pTypeDescr( 0 ) { if (rType.getTypeLibType()) typelib_typedescriptionreference_getDescription( &_pTypeDescr, rType.getTypeLibType() ); } //__________________________________________________________________________________________________ -inline TypeDescription::TypeDescription( const TypeDescription & rTypeDescr ) SAL_THROW( () ) +inline TypeDescription::TypeDescription( const TypeDescription & rTypeDescr ) SAL_THROW(()) : _pTypeDescr( rTypeDescr._pTypeDescr ) { if (_pTypeDescr) typelib_typedescription_acquire( _pTypeDescr ); } //__________________________________________________________________________________________________ -inline TypeDescription::TypeDescription( rtl_uString * pTypeName ) SAL_THROW( () ) +inline TypeDescription::TypeDescription( rtl_uString * pTypeName ) SAL_THROW(()) : _pTypeDescr( 0 ) { typelib_typedescription_getByName( &_pTypeDescr , pTypeName ); } //__________________________________________________________________________________________________ -inline TypeDescription::TypeDescription( const ::rtl::OUString & rTypeName ) SAL_THROW( () ) +inline TypeDescription::TypeDescription( const ::rtl::OUString & rTypeName ) SAL_THROW(()) : _pTypeDescr( 0 ) { typelib_typedescription_getByName( &_pTypeDescr , rTypeName.pData ); } //__________________________________________________________________________________________________ -inline TypeDescription::~TypeDescription() SAL_THROW( () ) +inline TypeDescription::~TypeDescription() SAL_THROW(()) { if (_pTypeDescr) typelib_typedescription_release( _pTypeDescr ); } //__________________________________________________________________________________________________ -inline TypeDescription & TypeDescription::operator = ( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) +inline TypeDescription & TypeDescription::operator = ( typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) { if (pTypeDescr) typelib_typedescription_acquire( pTypeDescr ); @@ -203,13 +203,13 @@ inline TypeDescription & TypeDescription::operator = ( typelib_TypeDescription * return *this; } //__________________________________________________________________________________________________ -inline sal_Bool TypeDescription::equals( const typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () ) +inline sal_Bool TypeDescription::equals( const typelib_TypeDescription * pTypeDescr ) const SAL_THROW(()) { return (_pTypeDescr && pTypeDescr && typelib_typedescription_equals( _pTypeDescr, pTypeDescr )); } //__________________________________________________________________________________________________ -inline void TypeDescription::makeComplete() const SAL_THROW( () ) +inline void TypeDescription::makeComplete() const SAL_THROW(()) { if (_pTypeDescr && !_pTypeDescr->bComplete) ::typelib_typedescription_complete( &_pTypeDescr ); diff --git a/cppu/inc/uno/current_context.hxx b/cppu/inc/uno/current_context.hxx index 80a7ad8d56b3..f1326e8108c3 100644 --- a/cppu/inc/uno/current_context.hxx +++ b/cppu/inc/uno/current_context.hxx @@ -50,7 +50,7 @@ namespace uno @return current context or null ref, if none is set */ inline Reference< XCurrentContext > SAL_CALL getCurrentContext() - SAL_THROW( () ) + SAL_THROW(()) { Reference< XCurrentContext > xRet; ::rtl::OUString aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ); @@ -64,7 +64,7 @@ inline Reference< XCurrentContext > SAL_CALL getCurrentContext() */ inline bool SAL_CALL setCurrentContext( Reference< XCurrentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { ::rtl::OUString aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ); return (::uno_setCurrentContext( xContext.get(), aEnvTypeName.pData, 0 ) != sal_False); @@ -90,22 +90,22 @@ public: */ inline ContextLayer( Reference< XCurrentContext > const & xNewContext = Reference< XCurrentContext >() ) - SAL_THROW( () ); + SAL_THROW(()); /** Destructor: restores the previous context. */ - inline ~ContextLayer() SAL_THROW( () ); + inline ~ContextLayer() SAL_THROW(()); /** Gets the previously set context. @return the previously set context */ inline Reference< XCurrentContext > SAL_CALL getPreviousContext() const - SAL_THROW( () ) + SAL_THROW(()) { return m_xPreviousContext; } }; //__________________________________________________________________________________________________ inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewContext ) - SAL_THROW( () ) + SAL_THROW(()) : m_aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) { ::uno_getCurrentContext( (void **)&m_xPreviousContext, m_aEnvTypeName.pData, 0 ); @@ -113,7 +113,7 @@ inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewCont } //__________________________________________________________________________________________________ inline ContextLayer::~ContextLayer() - SAL_THROW( () ) + SAL_THROW(()) { ::uno_setCurrentContext( m_xPreviousContext.get(), m_aEnvTypeName.pData, 0 ); } diff --git a/cppu/inc/uno/environment.hxx b/cppu/inc/uno/environment.hxx index 61b6b7aa275e..9acbe39f5dd4 100644 --- a/cppu/inc/uno/environment.hxx +++ b/cppu/inc/uno/environment.hxx @@ -64,17 +64,17 @@ public: respectively to current C++ Environment. @since UDK 3.2.7 */ - inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))) SAL_THROW( () ); + inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))) SAL_THROW(()); /// @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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(()) {} /// @endcond @@ -82,7 +82,7 @@ public: @param pEnv environment */ - inline Environment( uno_Environment * pEnv = 0 ) SAL_THROW( () ); + inline Environment( uno_Environment * pEnv = 0 ) SAL_THROW(()); /** Gets a specific environment. If the specified environment does not exist, then a default one is created and registered. @@ -90,64 +90,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 ) SAL_THROW(()); /** Copy constructor: acquires given environment @param rEnv another environment */ - inline Environment( const Environment & rEnv ) SAL_THROW( () ); + inline Environment( const Environment & rEnv ) SAL_THROW(()); /** Destructor: releases a set environment. */ - inline ~Environment() SAL_THROW( () ); + inline ~Environment() SAL_THROW(()); /** 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 ) SAL_THROW(()); /** 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 ) SAL_THROW(()) { 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 SAL_THROW(()) { 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 SAL_THROW(()) { 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 SAL_THROW(()) { return _pEnv->pContext; } /** Tests if a environment is set. @return true, if a environment is set, false otherwise */ - inline sal_Bool SAL_CALL is() const SAL_THROW( () ) + inline sal_Bool SAL_CALL is() const SAL_THROW(()) { return (_pEnv != 0); } /** Releases a set environment. */ - inline void SAL_CALL clear() SAL_THROW( () ); + inline void SAL_CALL clear() SAL_THROW(()); /** Invoke the passed function in this environment. @@ -155,7 +155,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 SAL_THROW(()); /** Invoke the passed function in this environment. @@ -163,49 +163,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 SAL_THROW(()); /** Enter this environment explicitly. @since UDK 3.2.7 */ - inline void SAL_CALL enter() const SAL_THROW( () ); + inline void SAL_CALL enter() const SAL_THROW(()); /** 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 SAL_THROW(()); }; //__________________________________________________________________________________________________ -inline Environment::Environment( uno_Environment * pEnv ) SAL_THROW( () ) +inline Environment::Environment( uno_Environment * pEnv ) SAL_THROW(()) : _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 ) SAL_THROW(()) : _pEnv(NULL) { uno_getEnvironment(&_pEnv, rEnvDcp.pData, pContext); } //__________________________________________________________________________________________________ -inline Environment::Environment( const Environment & rEnv ) SAL_THROW( () ) +inline Environment::Environment( const Environment & rEnv ) SAL_THROW(()) : _pEnv( rEnv._pEnv ) { if (_pEnv) (*_pEnv->acquire)( _pEnv ); } //__________________________________________________________________________________________________ -inline Environment::~Environment() SAL_THROW( () ) +inline Environment::~Environment() SAL_THROW(()) { if (_pEnv) (*_pEnv->release)( _pEnv ); } //__________________________________________________________________________________________________ -inline void Environment::clear() SAL_THROW( () ) +inline void Environment::clear() SAL_THROW(()) { if (_pEnv) { @@ -214,7 +214,7 @@ inline void Environment::clear() SAL_THROW( () ) } } //__________________________________________________________________________________________________ -inline Environment & Environment::operator = ( uno_Environment * pEnv ) SAL_THROW( () ) +inline Environment & Environment::operator = ( uno_Environment * pEnv ) SAL_THROW(()) { if (pEnv != _pEnv) { @@ -227,13 +227,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 SAL_THROW(()) { 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 SAL_THROW(()) { if (_pEnv) { @@ -246,17 +246,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 SAL_THROW(()) { 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 SAL_THROW(()) { 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) SAL_THROW(()) { Environment environment; diff --git a/cppu/inc/uno/mapping.hxx b/cppu/inc/uno/mapping.hxx index 2e50164d1c14..72f8b6cc9922 100644 --- a/cppu/inc/uno/mapping.hxx +++ b/cppu/inc/uno/mapping.hxx @@ -61,13 +61,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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(()) {} /// @endcond @@ -81,7 +81,7 @@ public: inline Mapping( const ::rtl::OUString & rFrom, const ::rtl::OUString & rTo, const ::rtl::OUString & rAddPurpose = ::rtl::OUString() ) - SAL_THROW( () ); + SAL_THROW(()); /** Holds a mapping from the specified source to the specified destination. @@ -92,7 +92,7 @@ public: inline Mapping( uno_Environment * pFrom, uno_Environment * pTo, const ::rtl::OUString & rAddPurpose = ::rtl::OUString() ) - SAL_THROW( () ); + SAL_THROW(()); /** Holds a mapping from the specified source to the specified destination environment. @@ -103,55 +103,55 @@ public: */ inline Mapping(const Environment & rFrom, const Environment & rTo, const ::rtl::OUString & rAddPurpose = ::rtl::OUString() ) - SAL_THROW( () ); + SAL_THROW(()); /** Constructor. @param pMapping another mapping */ - inline Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW( () ); + inline Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW(()); /** Copy constructor. @param rMapping another mapping */ - inline Mapping( const Mapping & rMapping ) SAL_THROW( () ); + inline Mapping( const Mapping & rMapping ) SAL_THROW(()); /** Destructor. */ - inline ~Mapping() SAL_THROW( () ); + inline ~Mapping() SAL_THROW(()); /** 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 ) SAL_THROW(()); /** 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 ) SAL_THROW(()) { 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 SAL_THROW(()) { return _pMapping; } /** Tests if a mapping is set. @return true if a mapping is set */ - inline sal_Bool SAL_CALL is() const SAL_THROW( () ) + inline sal_Bool SAL_CALL is() const SAL_THROW(()) { return (_pMapping != 0); } /** Releases a set mapping. */ - inline void SAL_CALL clear() SAL_THROW( () ); + inline void SAL_CALL clear() SAL_THROW(()); /** Maps an interface from one environment to another. @@ -159,14 +159,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 SAL_THROW(()); /** 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 SAL_THROW(()) { return mapInterface( pInterface, (typelib_InterfaceTypeDescription *)pTypeDescr ); } /** Maps an interface from one environment to another. @@ -176,7 +176,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 SAL_THROW(()); /** Maps an interface from one environment to another. @@ -184,7 +184,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 SAL_THROW(()) { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, pTypeDescr ); } /** Maps an interface from one environment to another. @@ -192,7 +192,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 SAL_THROW(()) { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, (typelib_InterfaceTypeDescription *)pTypeDescr ); } /** Maps an interface from one environment to another. @@ -201,12 +201,12 @@ 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 SAL_THROW(()); }; //__________________________________________________________________________________________________ inline Mapping::Mapping( const ::rtl::OUString & rFrom, const ::rtl::OUString & rTo, const ::rtl::OUString & rAddPurpose ) - SAL_THROW( () ) + SAL_THROW(()) : _pMapping( 0 ) { uno_getMappingByName( &_pMapping, rFrom.pData, rTo.pData, rAddPurpose.pData ); @@ -214,7 +214,7 @@ inline Mapping::Mapping( //__________________________________________________________________________________________________ inline Mapping::Mapping( uno_Environment * pFrom, uno_Environment * pTo, const ::rtl::OUString & rAddPurpose ) - SAL_THROW( () ) + SAL_THROW(()) : _pMapping( 0 ) { uno_getMapping( &_pMapping, pFrom, pTo, rAddPurpose.pData ); @@ -222,33 +222,33 @@ inline Mapping::Mapping( //__________________________________________________________________________________________________ inline Mapping::Mapping( const Environment & rFrom, const Environment & rTo, const ::rtl::OUString & rAddPurpose ) - SAL_THROW( () ) + 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 ) SAL_THROW(()) : _pMapping( pMapping ) { if (_pMapping) (*_pMapping->acquire)( _pMapping ); } //__________________________________________________________________________________________________ -inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW( () ) +inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW(()) : _pMapping( rMapping._pMapping ) { if (_pMapping) (*_pMapping->acquire)( _pMapping ); } //__________________________________________________________________________________________________ -inline Mapping::~Mapping() SAL_THROW( () ) +inline Mapping::~Mapping() SAL_THROW(()) { if (_pMapping) (*_pMapping->release)( _pMapping ); } //__________________________________________________________________________________________________ -inline void Mapping::clear() SAL_THROW( () ) +inline void Mapping::clear() SAL_THROW(()) { if (_pMapping) { @@ -257,7 +257,7 @@ inline void Mapping::clear() SAL_THROW( () ) } } //__________________________________________________________________________________________________ -inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW( () ) +inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(()) { if (pMapping) (*pMapping->acquire)( pMapping ); @@ -269,7 +269,7 @@ 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( () ) + SAL_THROW(()) { typelib_TypeDescription * pTD = 0; TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() ); @@ -282,7 +282,7 @@ inline void Mapping::mapInterface( //__________________________________________________________________________________________________ inline void * Mapping::mapInterface( void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const - SAL_THROW( () ) + SAL_THROW(()) { void * pOut = 0; (*_pMapping->mapInterface)( _pMapping, &pOut, pInterface, pTypeDescr ); @@ -291,7 +291,7 @@ inline void * Mapping::mapInterface( //__________________________________________________________________________________________________ inline void * Mapping::mapInterface( void * pInterface, const ::com::sun::star::uno::Type & rType ) const - SAL_THROW( () ) + SAL_THROW(()) { void * pOut = 0; mapInterface( &pOut, pInterface, rType ); @@ -311,7 +311,7 @@ inline void * Mapping::mapInterface( @deprecated */ template< class C > -inline sal_Bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_THROW( () ) +inline sal_Bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_THROW(()) { Mapping aMapping( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ), @@ -334,7 +334,7 @@ inline sal_Bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_TH @deprecated */ template< class C > -inline sal_Bool mapToUno( uno_Interface ** ppRet, const Reference< C > & x ) SAL_THROW( () ) +inline sal_Bool mapToUno( uno_Interface ** ppRet, const Reference< C > & x ) SAL_THROW(()) { Mapping aMapping( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ), diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx index 9db0182c2edc..7316623cb4be 100644 --- a/cppu/source/helper/purpenv/Proxy.hxx +++ b/cppu/source/helper/purpenv/Proxy.hxx @@ -68,7 +68,7 @@ public: rtl::OUString const & rOId, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext) - SAL_THROW( () ); + SAL_THROW(()); ~Proxy(void); void acquire(void); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx index ab110761bde1..2657e788e7de 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx @@ -128,14 +128,14 @@ Mapping::Mapping(uno_Environment * pFrom, uno_Environment * pTo, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext -) SAL_THROW( () ) +) SAL_THROW(()) : m_from (pFrom), m_to (pTo), m_nCount (1), m_probeFun(probeFun), m_pContext(pProbeContext) { - LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Mapping::Mapping(uno_Environment * pFrom, uno_Environment * pTo) SAL_THROW( () )", this)); + LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Mapping::Mapping(uno_Environment * pFrom, uno_Environment * pTo) SAL_THROW(())", this)); uno_Mapping::acquire = s_acquire; uno_Mapping::release = s_release; diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index 5d334be5cfad..1ff7eb95199e 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -50,7 +50,7 @@ using namespace com::sun::star; static bool relatesToInterface(typelib_TypeDescription * pTypeDescr) - SAL_THROW( () ) + SAL_THROW(()) { switch (pTypeDescr->eTypeClass) { diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index 2839406ea172..f1194c91003e 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -124,19 +124,19 @@ class ThreadKey oslThreadKeyCallbackFunction _pCallback; public: - inline oslThreadKey getThreadKey() SAL_THROW( () ); + inline oslThreadKey getThreadKey() SAL_THROW(()); - inline ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW( () ); - inline ~ThreadKey() SAL_THROW( () ); + inline ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW(()); + inline ~ThreadKey() SAL_THROW(()); }; //__________________________________________________________________________________________________ -inline ThreadKey::ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW( () ) +inline ThreadKey::ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW(()) : _bInit( sal_False ) , _pCallback( pCallback ) { } //__________________________________________________________________________________________________ -inline ThreadKey::~ThreadKey() SAL_THROW( () ) +inline ThreadKey::~ThreadKey() SAL_THROW(()) { if (_bInit) { @@ -144,7 +144,7 @@ inline ThreadKey::~ThreadKey() SAL_THROW( () ) } } //__________________________________________________________________________________________________ -inline oslThreadKey ThreadKey::getThreadKey() SAL_THROW( () ) +inline oslThreadKey ThreadKey::getThreadKey() SAL_THROW(()) { if (! _bInit) { @@ -180,7 +180,7 @@ extern "C" void SAL_CALL delete_IdContainer( void * p ) } } //================================================================================================== -IdContainer * getIdContainer() SAL_THROW( () ) +IdContainer * getIdContainer() SAL_THROW(()) { static ThreadKey s_key( delete_IdContainer ); oslThreadKey aKey = s_key.getThreadKey(); diff --git a/cppu/source/threadpool/current.hxx b/cppu/source/threadpool/current.hxx index 45640220116d..8d19a51c125a 100644 --- a/cppu/source/threadpool/current.hxx +++ b/cppu/source/threadpool/current.hxx @@ -45,7 +45,7 @@ struct IdContainer sal_Sequence * pCurrentId; }; -IdContainer * getIdContainer() SAL_THROW( () ); +IdContainer * getIdContainer() SAL_THROW(()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index f415c884463c..d19f7ba35d49 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -99,7 +99,7 @@ struct AlignSize_Impl static sal_Int32 nMaxAlignment = (sal_Int32)( (sal_Size)(&((AlignSize_Impl *) 16)->dDouble) - 16); static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment ) - SAL_THROW( () ) + SAL_THROW(()) { if( nRequestedAlignment > nMaxAlignment ) nRequestedAlignment = nMaxAlignment; @@ -111,7 +111,7 @@ static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment ) */ static inline sal_Int32 newAlignedSize( sal_Int32 OldSize, sal_Int32 ElementSize, sal_Int32 NeededAlignment ) - SAL_THROW( () ) + SAL_THROW(()) { NeededAlignment = adjustAlignment( NeededAlignment ); return (OldSize + NeededAlignment -1) / NeededAlignment * NeededAlignment + ElementSize; @@ -126,7 +126,7 @@ namespace // !for NOT REALLY WEAK TYPES only! static inline typelib_TypeDescriptionReference * igetTypeByName( rtl_uString * pTypeName ) - SAL_THROW( () ) + SAL_THROW(()) { typelib_TypeDescriptionReference * pRef = 0; ::typelib_typedescriptionreference_getByName( &pRef, pTypeName ); diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 169d29da3fcc..42489df0a9c1 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -89,7 +89,7 @@ struct AlignSize_Impl static sal_Int32 nMaxAlignment = (sal_Int32)( (sal_Size)(&((AlignSize_Impl *) 16)->dDouble) - 16); static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment ) - SAL_THROW( () ) + SAL_THROW(()) { if( nRequestedAlignment > nMaxAlignment ) nRequestedAlignment = nMaxAlignment; @@ -101,20 +101,20 @@ static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment ) */ static inline sal_Int32 newAlignedSize( sal_Int32 OldSize, sal_Int32 ElementSize, sal_Int32 NeededAlignment ) - SAL_THROW( () ) + SAL_THROW(()) { NeededAlignment = adjustAlignment( NeededAlignment ); return (OldSize + NeededAlignment -1) / NeededAlignment * NeededAlignment + ElementSize; } static inline sal_Bool reallyWeak( typelib_TypeClass eTypeClass ) - SAL_THROW( () ) + SAL_THROW(()) { return TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( eTypeClass ); } static inline sal_Int32 getDescriptionSize( typelib_TypeClass eTypeClass ) - SAL_THROW( () ) + SAL_THROW(()) { OSL_ASSERT( typelib_TypeClass_TYPEDEF != eTypeClass ); @@ -175,14 +175,14 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getByName( //----------------------------------------------------------------------------- struct equalStr_Impl { - sal_Bool operator()(const sal_Unicode * const & s1, const sal_Unicode * const & s2) const SAL_THROW( () ) + sal_Bool operator()(const sal_Unicode * const & s1, const sal_Unicode * const & s2) const SAL_THROW(()) { return 0 == rtl_ustr_compare( s1, s2 ); } }; //----------------------------------------------------------------------------- struct hashStr_Impl { - size_t operator()(const sal_Unicode * const & s) const SAL_THROW( () ) + size_t operator()(const sal_Unicode * const & s) const SAL_THROW(()) { return rtl_ustr_hashCode( s ); } }; @@ -211,9 +211,9 @@ struct TypeDescriptor_Init_Impl // The mutex to guard all type library accesses Mutex * pMutex; - inline Mutex & getMutex() SAL_THROW( () ); + inline Mutex & getMutex() SAL_THROW(()); - inline void callChain( typelib_TypeDescription ** ppRet, rtl_uString * pName ) SAL_THROW( () ); + inline void callChain( typelib_TypeDescription ** ppRet, rtl_uString * pName ) SAL_THROW(()); #if OSL_DEBUG_LEVEL > 1 // only for debugging @@ -241,10 +241,10 @@ struct TypeDescriptor_Init_Impl #endif {} - ~TypeDescriptor_Init_Impl() SAL_THROW( () ); + ~TypeDescriptor_Init_Impl() SAL_THROW(()); }; //__________________________________________________________________________________________________ -inline Mutex & TypeDescriptor_Init_Impl::getMutex() SAL_THROW( () ) +inline Mutex & TypeDescriptor_Init_Impl::getMutex() SAL_THROW(()) { if( !pMutex ) { @@ -257,7 +257,7 @@ inline Mutex & TypeDescriptor_Init_Impl::getMutex() SAL_THROW( () ) //__________________________________________________________________________________________________ inline void TypeDescriptor_Init_Impl::callChain( typelib_TypeDescription ** ppRet, rtl_uString * pName ) - SAL_THROW( () ) + SAL_THROW(()) { if (pCallbacks) { @@ -279,7 +279,7 @@ inline void TypeDescriptor_Init_Impl::callChain( } //__________________________________________________________________________________________________ -TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () ) +TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW(()) { if( pCache ) { @@ -425,7 +425,7 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( //------------------------------------------------------------------------ static inline void typelib_typedescription_initTables( typelib_TypeDescription * pTD ) - SAL_THROW( () ) + SAL_THROW(()) { typelib_InterfaceTypeDescription * pITD = (typelib_InterfaceTypeDescription *)pTD; @@ -1467,7 +1467,7 @@ void deleteExceptions( // frees anything except typelib_TypeDescription base! static inline void typelib_typedescription_destructExtendedMembers( typelib_TypeDescription * pTD ) - SAL_THROW( () ) + SAL_THROW(()) { OSL_ASSERT( typelib_TypeClass_TYPEDEF != pTD->eTypeClass ); @@ -1810,7 +1810,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register( //------------------------------------------------------------------------ static inline sal_Bool type_equals( typelib_TypeDescriptionReference * p1, typelib_TypeDescriptionReference * p2 ) - SAL_THROW( () ) + SAL_THROW(()) { return (p1 == p2 || (p1->eTypeClass == p2->eTypeClass && diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx index 42375832ab09..f4f126d701c3 100644 --- a/cppu/source/uno/assign.hxx +++ b/cppu/source/uno/assign.hxx @@ -46,7 +46,7 @@ namespace cppu inline void _assignInterface( void ** ppDest, void * pSource, uno_AcquireFunc acquire, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { _acquire( pSource, acquire ); void * const pToBeReleased = *ppDest; @@ -58,7 +58,7 @@ inline void * _queryInterface( void * pSource, typelib_TypeDescriptionReference * pDestType, uno_QueryInterfaceFunc queryInterface ) - SAL_THROW( () ) + SAL_THROW(()) { if (pSource) { @@ -73,13 +73,13 @@ sal_Bool assignStruct( void * pDest, void * pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) - SAL_THROW( () ); + SAL_THROW(()); //-------------------------------------------------------------------------------------------------- inline sal_Bool _assignStruct( void * pDest, void * pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { if (pTypeDescr->pBaseTypeDescription) { @@ -237,7 +237,7 @@ inline sal_Bool _assignData( void * pSource, typelib_TypeDescriptionReference * pSourceType, typelib_TypeDescription * pSourceTypeDescr, uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { if (pDest == pSource) return _type_equals( pDestType, pSourceType ); diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx index b8eb9b5cc5ce..c735051f9f48 100644 --- a/cppu/source/uno/constr.hxx +++ b/cppu/source/uno/constr.hxx @@ -42,7 +42,7 @@ namespace cppu inline void _defaultConstructUnion( void * pMem, typelib_TypeDescription * pTypeDescr ) - SAL_THROW( () ) + SAL_THROW(()) { ::uno_type_constructData( (char *)pMem + ((typelib_UnionTypeDescription *)pTypeDescr)->nValueOffset, @@ -53,12 +53,12 @@ inline void _defaultConstructUnion( void defaultConstructStruct( void * pMem, typelib_CompoundTypeDescription * pCompType ) - SAL_THROW( () ); + SAL_THROW(()); //-------------------------------------------------------------------------------------------------- inline void _defaultConstructStruct( void * pMem, typelib_CompoundTypeDescription * pTypeDescr ) - SAL_THROW( () ) + SAL_THROW(()) { if (pTypeDescr->pBaseTypeDescription) { @@ -161,7 +161,7 @@ inline void _defaultConstructData( void * pMem, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr ) - SAL_THROW( () ) + SAL_THROW(()) { switch (pType->eTypeClass) { diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx index 6416c22fb02c..07b9bca0e0a2 100644 --- a/cppu/source/uno/copy.hxx +++ b/cppu/source/uno/copy.hxx @@ -64,13 +64,13 @@ void copyConstructStruct( void * pDest, void * pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) - SAL_THROW ( () ); + SAL_THROW (()); //-------------------------------------------------------------------------------------------------- inline void _copyConstructStruct( void * pDest, void * pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) - SAL_THROW ( () ) + SAL_THROW (()) { if (pTypeDescr->pBaseTypeDescription) { @@ -143,7 +143,7 @@ inline void _copyConstructUnion( void * pDest, void * pSource, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) - SAL_THROW ( () ) + SAL_THROW (()) { typelib_TypeDescriptionReference * pSetType = _unionGetSetType( pSource, pTypeDescr ); if (mapping) @@ -175,7 +175,7 @@ inline void _copyConstructAnyFromData( uno_Any * pDestAny, void * pSource, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) - SAL_THROW ( () ) + SAL_THROW (()) { TYPE_ACQUIRE( pType ); pDestAny->pType = pType; @@ -339,7 +339,7 @@ inline void _copyConstructAny( uno_Any * pDestAny, void * pSource, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) - SAL_THROW ( () ) + SAL_THROW (()) { if (typelib_TypeClass_VOID == pType->eTypeClass) { @@ -718,7 +718,7 @@ inline void _copyConstructData( void * pDest, void * pSource, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) - SAL_THROW ( () ) + SAL_THROW (()) { switch (pType->eTypeClass) { diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index 88634494b83c..1336a9b9132b 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -127,7 +127,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p void defaultConstructStruct( void * pMem, typelib_CompoundTypeDescription * pCompType ) - SAL_THROW( () ) + SAL_THROW(()) { _defaultConstructStruct( pMem, pCompType ); } @@ -136,7 +136,7 @@ void copyConstructStruct( void * pDest, void * pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) - SAL_THROW( () ) + SAL_THROW(()) { _copyConstructStruct( pDest, pSource, pTypeDescr, acquire, mapping ); } @@ -145,7 +145,7 @@ void destructStruct( void * pValue, typelib_CompoundTypeDescription * pTypeDescr, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { _destructStruct( pValue, pTypeDescr, release ); } @@ -154,7 +154,7 @@ sal_Bool equalStruct( void * pDest, void *pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { return _equalStruct( pDest, pSource, pTypeDescr, queryInterface, release ); } @@ -163,7 +163,7 @@ sal_Bool assignStruct( void * pDest, void * pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { return _assignStruct( pDest, pSource, pTypeDescr, queryInterface, acquire, release ); } @@ -192,7 +192,7 @@ sal_Bool equalSequence( uno_Sequence * pDest, uno_Sequence * pSource, typelib_TypeDescriptionReference * pElementType, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { return _equalSequence( pDest, pSource, pElementType, queryInterface, release ); } diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx index 92da095f1ac1..0afd01163049 100644 --- a/cppu/source/uno/destr.hxx +++ b/cppu/source/uno/destr.hxx @@ -43,7 +43,7 @@ inline void _destructUnion( void * pValue, typelib_TypeDescription * pTypeDescr, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { typelib_TypeDescriptionReference * pType = _unionGetSetType( pValue, pTypeDescr ); ::uno_type_destructData( @@ -56,13 +56,13 @@ void destructStruct( void * pValue, typelib_CompoundTypeDescription * pTypeDescr, uno_ReleaseFunc release ) - SAL_THROW( () ); + SAL_THROW(()); //-------------------------------------------------------------------------------------------------- inline void _destructStruct( void * pValue, typelib_CompoundTypeDescription * pTypeDescr, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { if (pTypeDescr->pBaseTypeDescription) { @@ -114,7 +114,7 @@ void destructSequence( inline void _destructAny( uno_Any * pAny, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { typelib_TypeDescriptionReference * pType = pAny->pType; @@ -196,7 +196,7 @@ inline sal_Int32 idestructElements( void * pElements, typelib_TypeDescriptionReference * pElementType, sal_Int32 nStartIndex, sal_Int32 nStopIndex, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { switch (pElementType->eTypeClass) { @@ -367,7 +367,7 @@ inline void _destructData( typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { switch (pType->eTypeClass) { diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index fef81033cfa5..6fed374abd5e 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -46,7 +46,7 @@ namespace cppu inline sal_Bool _equalObject( void * pI1, void * pI2, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { if (pI1 == pI2) return sal_True; @@ -77,13 +77,13 @@ sal_Bool equalStruct( void * pDest, void *pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) - SAL_THROW( () ); + SAL_THROW(()); //-------------------------------------------------------------------------------------------------- inline sal_Bool _equalStruct( void * pDest, void *pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { if (pTypeDescr->pBaseTypeDescription && !equalStruct( pDest, pSource, pTypeDescr->pBaseTypeDescription, queryInterface, release )) @@ -114,13 +114,13 @@ sal_Bool equalSequence( uno_Sequence * pDest, uno_Sequence * pSource, typelib_TypeDescriptionReference * pElementType, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) - SAL_THROW( () ); + SAL_THROW(()); //-------------------------------------------------------------------------------------------------- inline sal_Bool _equalSequence( uno_Sequence * pDest, uno_Sequence * pSource, typelib_TypeDescriptionReference * pElementType, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { if (pDest == pSource) return sal_True; @@ -305,7 +305,7 @@ inline sal_Bool _equalData( void * pSource, typelib_TypeDescriptionReference * pSourceType, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) - SAL_THROW( () ) + SAL_THROW(()) { typelib_TypeClass eSourceTypeClass, eDestTypeClass; while (typelib_TypeClass_ANY == (eDestTypeClass = pDestType->eTypeClass)) diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 41add2c5276f..070e2dde8367 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -69,39 +69,39 @@ class Mapping uno_Mapping * _pMapping; public: - inline explicit Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW( () ); - inline Mapping( const Mapping & rMapping ) SAL_THROW( () ); - inline ~Mapping() SAL_THROW( () ); - inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping ) SAL_THROW( () ); - inline Mapping & SAL_CALL operator = ( const Mapping & rMapping ) SAL_THROW( () ) + inline explicit Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW(()); + inline Mapping( const Mapping & rMapping ) SAL_THROW(()); + inline ~Mapping() SAL_THROW(()); + inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping ) SAL_THROW(()); + inline Mapping & SAL_CALL operator = ( const Mapping & rMapping ) SAL_THROW(()) { return operator = ( rMapping._pMapping ); } - inline uno_Mapping * SAL_CALL get() const SAL_THROW( () ) + inline uno_Mapping * SAL_CALL get() const SAL_THROW(()) { return _pMapping; } - inline sal_Bool SAL_CALL is() const SAL_THROW( () ) + inline sal_Bool SAL_CALL is() const SAL_THROW(()) { return (_pMapping != 0); } }; //__________________________________________________________________________________________________ -inline Mapping::Mapping( uno_Mapping * pMapping ) SAL_THROW( () ) +inline Mapping::Mapping( uno_Mapping * pMapping ) SAL_THROW(()) : _pMapping( pMapping ) { if (_pMapping) (*_pMapping->acquire)( _pMapping ); } //__________________________________________________________________________________________________ -inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW( () ) +inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW(()) : _pMapping( rMapping._pMapping ) { if (_pMapping) (*_pMapping->acquire)( _pMapping ); } //__________________________________________________________________________________________________ -inline Mapping::~Mapping() SAL_THROW( () ) +inline Mapping::~Mapping() SAL_THROW(()) { if (_pMapping) (*_pMapping->release)( _pMapping ); } //__________________________________________________________________________________________________ -inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW( () ) +inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(()) { if (pMapping) (*pMapping->acquire)( pMapping ); @@ -122,7 +122,7 @@ struct MappingEntry MappingEntry( uno_Mapping * pMapping_, uno_freeMappingFunc freeMapping_, const OUString & rMappingName_ ) - SAL_THROW( () ) + SAL_THROW(()) : nRef( 1 ) , pMapping( pMapping_ ) , freeMapping( freeMapping_ ) @@ -132,13 +132,13 @@ struct MappingEntry //-------------------------------------------------------------------------------------------------- struct FctOUStringHash : public std::unary_function< const OUString &, size_t > { - size_t operator()( const OUString & rKey ) const SAL_THROW( () ) + size_t operator()( const OUString & rKey ) const SAL_THROW(()) { return (size_t)rKey.hashCode(); } }; //-------------------------------------------------------------------------------------------------- struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t > { - size_t operator()( uno_Mapping * pKey ) const SAL_THROW( () ) + size_t operator()( uno_Mapping * pKey ) const SAL_THROW(()) { return (size_t)pKey; } }; @@ -164,7 +164,7 @@ struct MappingsData t_OUStringSet aNegativeLibs; }; //-------------------------------------------------------------------------------------------------- -static MappingsData & getMappingsData() SAL_THROW( () ) +static MappingsData & getMappingsData() SAL_THROW(()) { static MappingsData * s_p = 0; if (! s_p) @@ -200,19 +200,19 @@ struct uno_Mediate_Mapping : public uno_Mapping const Environment & rFrom_, const Environment & rTo_, const Mapping & rFrom2Uno_, const Mapping & rUno2To_, const OUString & rAddPurpose ) - SAL_THROW( () ); + SAL_THROW(()); }; extern "C" { //-------------------------------------------------------------------------------------------------- static void SAL_CALL mediate_free( uno_Mapping * pMapping ) - SAL_THROW( () ) + SAL_THROW(()) { delete static_cast< uno_Mediate_Mapping * >( pMapping ); } //-------------------------------------------------------------------------------------------------- static void SAL_CALL mediate_acquire( uno_Mapping * pMapping ) - SAL_THROW( () ) + SAL_THROW(()) { if (1 == ::osl_incrementInterlockedCount( & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef )) @@ -226,7 +226,7 @@ static void SAL_CALL mediate_acquire( uno_Mapping * pMapping ) } //-------------------------------------------------------------------------------------------------- static void SAL_CALL mediate_release( uno_Mapping * pMapping ) - SAL_THROW( () ) + SAL_THROW(()) { if (! ::osl_decrementInterlockedCount( & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef )) @@ -239,7 +239,7 @@ static void SAL_CALL mediate_mapInterface( uno_Mapping * pMapping, void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pInterfaceTypeDescr ) - SAL_THROW( () ) + SAL_THROW(()) { OSL_ENSURE( pMapping && ppOut, "### null ptr!" ); if (pMapping && ppOut) @@ -275,7 +275,7 @@ uno_Mediate_Mapping::uno_Mediate_Mapping( const Environment & rFrom_, const Environment & rTo_, const Mapping & rFrom2Uno_, const Mapping & rUno2To_, const OUString & rAddPurpose_ ) - SAL_THROW( () ) + SAL_THROW(()) : nRef( 1 ) , aFrom( rFrom_ ) , aTo( rTo_ ) @@ -291,7 +291,7 @@ uno_Mediate_Mapping::uno_Mediate_Mapping( //================================================================================================== static inline OUString getMappingName( const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose ) - SAL_THROW( () ) + SAL_THROW(()) { OUStringBuffer aKey( 64 ); aKey.append( rAddPurpose ); @@ -309,7 +309,7 @@ static inline OUString getMappingName( //================================================================================================== static inline OUString getBridgeName( const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose ) - SAL_THROW( () ) + SAL_THROW(()) { OUStringBuffer aBridgeName( 16 ); if (!rAddPurpose.isEmpty()) @@ -324,7 +324,7 @@ static inline OUString getBridgeName( } //================================================================================================== static inline void setNegativeBridge( const OUString & rBridgeName ) - SAL_THROW( () ) + SAL_THROW(()) { MappingsData & rData = getMappingsData(); MutexGuard aGuard( rData.aNegativeLibsMutex ); @@ -332,7 +332,7 @@ static inline void setNegativeBridge( const OUString & rBridgeName ) } //================================================================================================== static inline oslModule loadModule( const OUString & rBridgeName ) - SAL_THROW( () ) + SAL_THROW(()) { sal_Bool bNeg; { @@ -356,7 +356,7 @@ static inline oslModule loadModule( const OUString & rBridgeName ) //================================================================================================== static Mapping loadExternalMapping( const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose ) - SAL_THROW( () ) + SAL_THROW(()) { OSL_ASSERT( rFrom.is() && rTo.is() ); if (rFrom.is() && rTo.is()) @@ -400,7 +400,7 @@ static Mapping loadExternalMapping( //================================================================================================== static Mapping getDirectMapping( const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose = OUString() ) - SAL_THROW( () ) + SAL_THROW(()) { OSL_ASSERT( rFrom.is() && rTo.is() ); if (rFrom.is() && rTo.is()) @@ -430,7 +430,7 @@ static inline Mapping createMediateMapping( const Environment & rFrom, const Environment & rTo, const Mapping & rFrom2Uno, const Mapping & rUno2To, const OUString & rAddPurpose ) - SAL_THROW( () ) + SAL_THROW(()) { uno_Mapping * pRet = new uno_Mediate_Mapping( rFrom, rTo, rFrom2Uno, rUno2To, rAddPurpose ); // ref count initially 1 @@ -443,7 +443,7 @@ static inline Mapping createMediateMapping( //================================================================================================== static Mapping getMediateMapping( const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose ) - SAL_THROW( () ) + SAL_THROW(()) { Environment aUno; Mapping aUno2To; diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx index 81f6f3148173..b7871b078202 100644 --- a/cppu/source/uno/prim.hxx +++ b/cppu/source/uno/prim.hxx @@ -58,7 +58,7 @@ inline void * _map( void * p, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, uno_Mapping * mapping ) - SAL_THROW( () ) + SAL_THROW(()) { void * pRet = 0; if (p) @@ -79,7 +79,7 @@ inline void * _map( return pRet; } //-------------------------------------------------------------------------------------------------- -inline void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW( () ) +inline void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW(()) { if (p) { @@ -94,7 +94,7 @@ inline void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW( () ) } } //-------------------------------------------------------------------------------------------------- -inline void _release( void * p, uno_ReleaseFunc release ) SAL_THROW( () ) +inline void _release( void * p, uno_ReleaseFunc release ) SAL_THROW(()) { if (p) { @@ -123,14 +123,14 @@ inline sal_uInt32 calcSeqMemSize( } //-------------------------------------------------------------------------------------------------- -inline uno_Sequence * createEmptySequence() SAL_THROW( () ) +inline uno_Sequence * createEmptySequence() SAL_THROW(()) { ::osl_incrementInterlockedCount( &g_emptySeq.nRefCount ); return &g_emptySeq; } //-------------------------------------------------------------------------------------------------- inline typelib_TypeDescriptionReference * _getVoidType() - SAL_THROW( () ) + SAL_THROW(()) { if (! g_pVoidType) { @@ -162,7 +162,7 @@ extern "C" void * binuno_queryInterface( //-------------------------------------------------------------------------------------------------- inline typelib_TypeDescriptionReference * _unionGetSetType( void * pUnion, typelib_TypeDescription * pTD ) - SAL_THROW( () ) + SAL_THROW(()) { typelib_TypeDescriptionReference * pRet = 0; sal_Int32 nPos; @@ -188,7 +188,7 @@ inline typelib_TypeDescriptionReference * _unionGetSetType( //-------------------------------------------------------------------------------------------------- inline sal_Bool _type_equals( typelib_TypeDescriptionReference * pType1, typelib_TypeDescriptionReference * pType2 ) - SAL_THROW( () ) + SAL_THROW(()) { return (pType1 == pType2 || (pType1->eTypeClass == pType2->eTypeClass && diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx index 4910adb57261..518f45d594a7 100644 --- a/cppuhelper/inc/cppuhelper/access_control.hxx +++ b/cppuhelper/inc/cppuhelper/access_control.hxx @@ -68,7 +68,7 @@ public: /** Clears the access controller reference being used. */ - inline void SAL_CALL clear() SAL_THROW( () ) + inline void SAL_CALL clear() SAL_THROW(()) { m_xController.clear(); } /** Returns access to the access controller reference being used. @@ -76,14 +76,14 @@ public: @return access controller */ inline ::com::sun::star::uno::Reference< - ::com::sun::star::security::XAccessController > const & SAL_CALL get() const SAL_THROW( () ) + ::com::sun::star::security::XAccessController > const & SAL_CALL get() const SAL_THROW(()) { return m_xController; } /** Returns access to the access controller reference being used. @return access controller */ - inline ::com::sun::star::security::XAccessController * SAL_CALL operator -> () const SAL_THROW( () ) + inline ::com::sun::star::security::XAccessController * SAL_CALL operator -> () const SAL_THROW(()) { return m_xController.get(); } diff --git a/cppuhelper/inc/cppuhelper/bootstrap.hxx b/cppuhelper/inc/cppuhelper/bootstrap.hxx index 41c69ad3cc0e..319854a14960 100644 --- a/cppuhelper/inc/cppuhelper/bootstrap.hxx +++ b/cppuhelper/inc/cppuhelper/bootstrap.hxx @@ -52,7 +52,7 @@ namespace cppu CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > SAL_CALL createSimpleRegistry( const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() ) - SAL_THROW( () ); + SAL_THROW(()); /** Creates a nested registry service instance. @@ -62,7 +62,7 @@ SAL_CALL createSimpleRegistry( CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > SAL_CALL createNestedRegistry( const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() ) - SAL_THROW( () ); + SAL_THROW(()); /** Installs type description manager instance, i.e. registers a callback at cppu core. @@ -71,7 +71,7 @@ SAL_CALL createNestedRegistry( */ CPPUHELPER_DLLPUBLIC sal_Bool SAL_CALL installTypeDescriptionManager( ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > const & xTDMgr ) - SAL_THROW( () ); + SAL_THROW(()); /** Bootstraps an initial component context with service manager upon a given registry. This includes insertion of initial services: diff --git a/cppuhelper/inc/cppuhelper/compbase.hxx b/cppuhelper/inc/cppuhelper/compbase.hxx index eb57e18fd4b7..60e99eef3840 100644 --- a/cppuhelper/inc/cppuhelper/compbase.hxx +++ b/cppuhelper/inc/cppuhelper/compbase.hxx @@ -47,7 +47,7 @@ class SAL_NO_VTABLE WeakComponentImplHelper##N \ { \ static ClassData##N s_aCD; \ public: \ - WeakComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW( () ) \ + WeakComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW(()) \ : WeakComponentImplHelperBase( rMutex ) \ {} \ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \ @@ -73,7 +73,7 @@ class SAL_NO_VTABLE WeakAggComponentImplHelper##N \ { \ static ClassData##N s_aCD; \ public: \ - WeakAggComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW( () ) \ + WeakAggComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW(()) \ : WeakAggComponentImplHelperBase( rMutex ) \ {} \ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \ diff --git a/cppuhelper/inc/cppuhelper/compbase_ex.hxx b/cppuhelper/inc/cppuhelper/compbase_ex.hxx index ca7e0ccfdefa..0eff32185105 100644 --- a/cppuhelper/inc/cppuhelper/compbase_ex.hxx +++ b/cppuhelper/inc/cppuhelper/compbase_ex.hxx @@ -59,20 +59,20 @@ protected: @param rMutex mutex to sync upon disposing */ - WeakComponentImplHelperBase( ::osl::Mutex & rMutex ) SAL_THROW( () ); + WeakComponentImplHelperBase( ::osl::Mutex & rMutex ) SAL_THROW(()); public: /** Destructor */ - virtual ~WeakComponentImplHelperBase() SAL_THROW( () ); + virtual ~WeakComponentImplHelperBase() SAL_THROW(()); // 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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) {} virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( @@ -106,18 +106,18 @@ protected: */ virtual void SAL_CALL disposing(); - WeakAggComponentImplHelperBase( ::osl::Mutex & rMutex ) SAL_THROW( () ); + WeakAggComponentImplHelperBase( ::osl::Mutex & rMutex ) SAL_THROW(()); public: - virtual ~WeakAggComponentImplHelperBase() SAL_THROW( () ); + virtual ~WeakAggComponentImplHelperBase() SAL_THROW(()); // 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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) {} virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx index ccbddc0e0aae..64c6a63693c5 100644 --- a/cppuhelper/inc/cppuhelper/component.hxx +++ b/cppuhelper/inc/cppuhelper/component.hxx @@ -63,7 +63,7 @@ public: the mutex used to protect multi-threaded access; lifetime must be longer than the lifetime of this object. */ - OComponentHelper( ::osl::Mutex & rMutex ) SAL_THROW( () ); + OComponentHelper( ::osl::Mutex & rMutex ) SAL_THROW(()); /** Destructor. If this object was not disposed previously, object will be disposed manually. */ virtual ~OComponentHelper() SAL_THROW( (::com::sun::star::uno::RuntimeException) ); @@ -111,8 +111,8 @@ protected: /// @endcond private: - inline OComponentHelper( const OComponentHelper & ) SAL_THROW( () ); - inline OComponentHelper & operator = ( const OComponentHelper & ) SAL_THROW( () ); + inline OComponentHelper( const OComponentHelper & ) SAL_THROW(()); + inline OComponentHelper & operator = ( const OComponentHelper & ) SAL_THROW(()); }; } diff --git a/cppuhelper/inc/cppuhelper/component_context.hxx b/cppuhelper/inc/cppuhelper/component_context.hxx index bcb02c705555..06e1f264394d 100644 --- a/cppuhelper/inc/cppuhelper/component_context.hxx +++ b/cppuhelper/inc/cppuhelper/component_context.hxx @@ -56,7 +56,7 @@ struct ContextEntry_Init /** Default ctor. */ - inline ContextEntry_Init() SAL_THROW( () ) + inline ContextEntry_Init() SAL_THROW(()) : bLateInitService( false ) {} /** Ctor. @@ -72,7 +72,7 @@ struct ContextEntry_Init inline ContextEntry_Init( ::rtl::OUString const & name_, ::com::sun::star::uno::Any const & value_, - bool bLateInitService_ = false ) SAL_THROW( () ) + bool bLateInitService_ = false ) SAL_THROW(()) : bLateInitService( bLateInitService_ ), name( name_ ), value( value_ ) @@ -91,7 +91,7 @@ SAL_CALL createComponentContext( ContextEntry_Init const * pEntries, sal_Int32 nEntries, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xDelegate = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ) - SAL_THROW( () ); + SAL_THROW(()); } diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx index 2653908c9ba2..c100eab61d55 100644 --- a/cppuhelper/inc/cppuhelper/factory.hxx +++ b/cppuhelper/inc/cppuhelper/factory.hxx @@ -150,7 +150,7 @@ SAL_CALL createSingleComponentFactory( ::rtl::OUString const & rImplementationName, ::com::sun::star::uno::Sequence< ::rtl::OUString > const & rServiceNames, rtl_ModuleCount * pModCount = 0 ) - SAL_THROW( () ); + SAL_THROW(()); /** Creates a single service factory which holds the instance created only once. @@ -167,7 +167,7 @@ createOneInstanceComponentFactory( ::rtl::OUString const & rImplementationName, ::com::sun::star::uno::Sequence< ::rtl::OUString > const & rServiceNames, rtl_ModuleCount * pModCount = 0 ) - SAL_THROW( () ); + SAL_THROW(()); /** Deprecated. The type of the instanciate function used as argument of the create*Fcatory functions. @@ -198,7 +198,7 @@ createSingleFactory( ComponentInstantiation pCreateFunction, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rServiceNames, rtl_ModuleCount * pModCount = 0 ) - SAL_THROW( () ); + SAL_THROW(()); /** Deprecated. Creates a factory wrapping another one. This means the methods of the interfaces XServiceProvider, XServiceInfo and @@ -218,7 +218,7 @@ CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::X createFactoryProxy( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > & rFactory ) - SAL_THROW( () ); + SAL_THROW(()); /** Deprecated. Creates a single service factory which holds the instance created only once. @@ -240,7 +240,7 @@ createOneInstanceFactory( ComponentInstantiation pCreateFunction, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rServiceNames, rtl_ModuleCount * pModCount = 0 ) - SAL_THROW( () ); + SAL_THROW(()); /** Deprecated. Creates a single service factory based on a registry. @@ -256,7 +256,7 @@ createSingleRegistryFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, const ::rtl::OUString & rImplementationName, const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey ) - SAL_THROW( () ); + SAL_THROW(()); /** Deprecated. Creates a single service factory which holds the instance created only once based on a registry. @@ -275,7 +275,7 @@ createOneInstanceRegistryFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, const ::rtl::OUString & rComponentName, const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey ) - SAL_THROW( () ); + SAL_THROW(()); } diff --git a/cppuhelper/inc/cppuhelper/implbase.hxx b/cppuhelper/inc/cppuhelper/implbase.hxx index f7fe3a228853..06506d3092a4 100644 --- a/cppuhelper/inc/cppuhelper/implbase.hxx +++ b/cppuhelper/inc/cppuhelper/implbase.hxx @@ -89,15 +89,15 @@ struct CPPUHELPER_DLLPUBLIC ClassDataBase /** def ctor */ - ClassDataBase() SAL_THROW( () ); + ClassDataBase() SAL_THROW(()); /** class code ctor @param nClassCode class code, see ClassDataBase::nClassCode */ - ClassDataBase( sal_Int32 nClassCode ) SAL_THROW( () ); + ClassDataBase( sal_Int32 nClassCode ) SAL_THROW(()); /** dtor */ - ~ClassDataBase() SAL_THROW( () ); + ~ClassDataBase() SAL_THROW(()); }; /** Struct used for inline template implementation helpers: There will be versions of this struct with varying arType2Offset[] array sizes, each of which @@ -113,14 +113,14 @@ struct CPPUHELPER_DLLPUBLIC ClassData : public ClassDataBase /** init call for supporting com.sun.star.lang.XTypeProvider */ - void SAL_CALL initTypeProvider() SAL_THROW( () ); + void SAL_CALL initTypeProvider() SAL_THROW(()); /** initial writing type offsets for vtables @param rType type of interface @param nOffset offset to vtable entry */ void SAL_CALL writeTypeOffset( const ::com::sun::star::uno::Type & rType, sal_Int32 nOffset ) - SAL_THROW( () ); + SAL_THROW(()); /** Queries for an interface. @@ -130,25 +130,25 @@ struct CPPUHELPER_DLLPUBLIC ClassData : public ClassDataBase */ ::com::sun::star::uno::Any SAL_CALL query( const ::com::sun::star::uno::Type & rType, ::com::sun::star::lang::XTypeProvider * pBase ) - SAL_THROW( () ); + SAL_THROW(()); /** Gets the types for supporting com.sun.star.lang.XTypeProvider @return sequence of types supported */ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - SAL_THROW( () ); + SAL_THROW(()); /** Gets the class id of implementation supporting com.sun.star.lang.XTypeProvider @return class identifier (sequence< byte >) */ ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - SAL_THROW( () ); + SAL_THROW(()); }; /** Shared mutex for implementation helper initialization. Not for public use. */ -CPPUHELPER_DLLPUBLIC ::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () ); +CPPUHELPER_DLLPUBLIC ::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(()); } // @@ -176,7 +176,7 @@ namespace cppu \ struct ClassData##N : public ClassDataBase \ { \ Type_Offset arType2Offset[ N ]; \ - ClassData##N( sal_Int32 nInClassCode ) SAL_THROW( () ) \ + ClassData##N( sal_Int32 nInClassCode ) SAL_THROW(()) \ : ClassDataBase( nInClassCode ) \ {} \ }; \ @@ -186,7 +186,7 @@ class SAL_NO_VTABLE ImplHelperBase##N \ , __PUBLIC_IFC##N \ { \ protected: \ - ClassData & SAL_CALL getClassData( ClassDataBase & s_aCD ) SAL_THROW( () ) \ + ClassData & SAL_CALL getClassData( ClassDataBase & s_aCD ) SAL_THROW(()) \ { \ ClassData & rCD = * static_cast< ClassData * >( &s_aCD ); \ if (! rCD.bOffsetsInit) \ diff --git a/cppuhelper/inc/cppuhelper/implbase_ex.hxx b/cppuhelper/inc/cppuhelper/implbase_ex.hxx index 55bfd28c67e5..ba70e8d103e4 100644 --- a/cppuhelper/inc/cppuhelper/implbase_ex.hxx +++ b/cppuhelper/inc/cppuhelper/implbase_ex.hxx @@ -55,7 +55,7 @@ namespace cppu /** function pointer signature for getCppuType */ -typedef ::com::sun::star::uno::Type const & (SAL_CALL * fptr_getCppuType)( void * ) SAL_THROW( () ); +typedef ::com::sun::star::uno::Type const & (SAL_CALL * fptr_getCppuType)( void * ) SAL_THROW(()); /** single type + object offset */ diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx index eaa9280918b5..04353f451532 100644 --- a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx +++ b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx @@ -181,7 +181,7 @@ class SAL_NO_VTABLE WeakComponentImplHelper##N \ { \ static class_data##N s_cd; \ public: \ - inline WeakComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW( () ) \ + inline WeakComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW(()) \ : WeakComponentImplHelperBase( rMutex ) \ {} \ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \ @@ -206,7 +206,7 @@ class SAL_NO_VTABLE WeakAggComponentImplHelper##N \ { \ static class_data##N s_cd; \ public: \ - inline WeakAggComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW( () ) \ + inline WeakAggComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW(()) \ : WeakAggComponentImplHelperBase( rMutex ) \ {} \ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \ diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h index 454013c9c282..8282893ec851 100644 --- a/cppuhelper/inc/cppuhelper/interfacecontainer.h +++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h @@ -82,28 +82,28 @@ public: @param rCont the container of the elements. */ - OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont ) SAL_THROW( () ); + OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont ) SAL_THROW(()); /** Releases the connection to the container. */ - ~OInterfaceIteratorHelper() SAL_THROW( () ); + ~OInterfaceIteratorHelper() SAL_THROW(()); /** Return sal_True, if there are more elements in the iterator. */ - sal_Bool SAL_CALL hasMoreElements() const SAL_THROW( () ) + sal_Bool SAL_CALL hasMoreElements() const SAL_THROW(()) { return nRemain != 0; } /** Return the next element of the iterator. Calling this method if hasMoreElements() has returned sal_False, is an error. Cast the returned pointer to the */ - ::com::sun::star::uno::XInterface * SAL_CALL next() SAL_THROW( () ); + ::com::sun::star::uno::XInterface * SAL_CALL next() SAL_THROW(()); /** Removes the current element (the last one returned by next()) from the underlying container. Calling this method before next() has been called or calling it twice with no next() inbetween is an error. */ - void SAL_CALL remove() SAL_THROW( () ); + void SAL_CALL remove() SAL_THROW(()); private: OInterfaceContainerHelper & rCont; @@ -113,8 +113,8 @@ private: sal_Int32 nRemain; - OInterfaceIteratorHelper( const OInterfaceIteratorHelper & ) SAL_THROW( () ); - OInterfaceIteratorHelper & operator = ( const OInterfaceIteratorHelper & ) SAL_THROW( () ); + OInterfaceIteratorHelper( const OInterfaceIteratorHelper & ) SAL_THROW(()); + OInterfaceIteratorHelper & operator = ( const OInterfaceIteratorHelper & ) SAL_THROW(()); }; //=================================================================== @@ -128,13 +128,13 @@ class CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper { public: // 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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) {} /** @@ -144,22 +144,22 @@ public: The lifetime must be longer than the lifetime of this object. */ - OInterfaceContainerHelper( ::osl::Mutex & rMutex ) SAL_THROW( () ); + OInterfaceContainerHelper( ::osl::Mutex & rMutex ) SAL_THROW(()); /** Release all interfaces. All iterators must be destroyed before the container is destructed. */ - ~OInterfaceContainerHelper() SAL_THROW( () ); + ~OInterfaceContainerHelper() SAL_THROW(()); /** Return the number of Elements in the container. Only useful if you have acquired the mutex. */ - sal_Int32 SAL_CALL getLength() const SAL_THROW( () ); + sal_Int32 SAL_CALL getLength() const SAL_THROW(()); /** Return all interfaces added to this container. **/ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getElements() const SAL_THROW( () ); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getElements() const SAL_THROW(()); /** Inserts an element into the container. The position is not specified, thus it is not specified in which order events are fired. @@ -177,7 +177,7 @@ public: @return the new count of elements in the container */ - sal_Int32 SAL_CALL addInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) SAL_THROW( () ); + sal_Int32 SAL_CALL addInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) SAL_THROW(()); /** Removes an element from the container. It uses interface equality to remove the interface. @param rxIFace @@ -185,16 +185,16 @@ public: @return the new count of elements in the container */ - sal_Int32 SAL_CALL removeInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) SAL_THROW( () ); + sal_Int32 SAL_CALL removeInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) SAL_THROW(()); /** Call disposing on all object in the container that support XEventListener. Than clear the container. */ - void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ); + void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW(()); /** Clears the container without calling disposing(). */ - void SAL_CALL clear() SAL_THROW( () ); + void SAL_CALL clear() SAL_THROW(()); /** Executes a functor for each contained listener of specified type, e.g. <code>forEach<awt::XPaintListener>(...</code>. @@ -247,14 +247,14 @@ friend class OInterfaceIteratorHelper; /** TRUE -> aData.pAsSequence is of type Sequence< XInterfaceSequence >. */ sal_Bool bIsList; - OInterfaceContainerHelper( const OInterfaceContainerHelper & ) SAL_THROW( () ); - OInterfaceContainerHelper & operator = ( const OInterfaceContainerHelper & ) SAL_THROW( () ); + OInterfaceContainerHelper( const OInterfaceContainerHelper & ) SAL_THROW(()); + OInterfaceContainerHelper & operator = ( const OInterfaceContainerHelper & ) SAL_THROW(()); /* Dulicate content of the conaitner and release the old one without destroying. The mutex must be locked and the memberbInUse must be true. */ - void copyAndResetInUse() SAL_THROW( () ); + void copyAndResetInUse() SAL_THROW(()); private: template< typename ListenerT, typename EventT > @@ -315,13 +315,13 @@ class OMultiTypeInterfaceContainerHelperVar { public: // 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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) {} /** @@ -331,16 +331,16 @@ public: The lifetime must be longer than the lifetime of this object. */ - inline OMultiTypeInterfaceContainerHelperVar( ::osl::Mutex & ) SAL_THROW( () ); + inline OMultiTypeInterfaceContainerHelperVar( ::osl::Mutex & ) SAL_THROW(()); /** Deletes all containers. */ - inline ~OMultiTypeInterfaceContainerHelperVar() SAL_THROW( () ); + inline ~OMultiTypeInterfaceContainerHelperVar() SAL_THROW(()); /** Return all id's under which at least one interface is added. */ - inline ::com::sun::star::uno::Sequence< key > SAL_CALL getContainedTypes() const SAL_THROW( () ); + inline ::com::sun::star::uno::Sequence< key > SAL_CALL getContainedTypes() const SAL_THROW(()); /** Return the container created under this key. @@ -348,7 +348,7 @@ public: @return the container created under this key. If the container was not created, null was returned. */ - inline OInterfaceContainerHelper * SAL_CALL getContainer( const key & ) const SAL_THROW( () ); + inline OInterfaceContainerHelper * SAL_CALL getContainer( const key & ) const SAL_THROW(()); /** Inserts an element into the container with the specified key. The position is not specified, thus it is not specified in which order events are fired. @@ -371,7 +371,7 @@ public: inline sal_Int32 SAL_CALL addInterface( const key & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r ) - SAL_THROW( () ); + SAL_THROW(()); /** Removes an element from the container with the specified key. It uses interface equality to remove the interface. @@ -386,18 +386,18 @@ public: inline sal_Int32 SAL_CALL removeInterface( const key & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) - SAL_THROW( () ); + SAL_THROW(()); /** Call disposing on all references in the container, that support XEventListener. Then clears the container. @param rEvt the event object which is passed during disposing() call */ - inline void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ); + inline void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW(()); /** Remove all elements of all containers. Does not delete the container. */ - inline void SAL_CALL clear() SAL_THROW( () ); + inline void SAL_CALL clear() SAL_THROW(()); typedef key keyType; private: @@ -420,8 +420,8 @@ private: return iter; } - inline OMultiTypeInterfaceContainerHelperVar( const OMultiTypeInterfaceContainerHelperVar & ) SAL_THROW( () ); - inline OMultiTypeInterfaceContainerHelperVar & operator = ( const OMultiTypeInterfaceContainerHelperVar & ) SAL_THROW( () ); + inline OMultiTypeInterfaceContainerHelperVar( const OMultiTypeInterfaceContainerHelperVar & ) SAL_THROW(()); + inline OMultiTypeInterfaceContainerHelperVar & operator = ( const OMultiTypeInterfaceContainerHelperVar & ) SAL_THROW(()); }; @@ -452,7 +452,7 @@ struct OBroadcastHelperVar Initialize the structur. bDispose and bInDispose are set to false. @param rMutex the mutex reference. */ - OBroadcastHelperVar( ::osl::Mutex & rMutex_ ) SAL_THROW( () ) + OBroadcastHelperVar( ::osl::Mutex & rMutex_ ) SAL_THROW(()) : rMutex( rMutex_ ) , aLC( rMutex_ ) , bDisposed( sal_False ) @@ -465,7 +465,7 @@ struct OBroadcastHelperVar inline void addListener( const keyType &key, const ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > &r ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard guard( rMutex ); OSL_ENSURE( !bInDispose, "do not add listeners in the dispose call" ); @@ -480,7 +480,7 @@ struct OBroadcastHelperVar inline void removeListener( const keyType &key, const ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > & r ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard guard( rMutex ); OSL_ENSURE( !bDisposed, "object is disposed" ); @@ -494,7 +494,7 @@ struct OBroadcastHelperVar was not created, null was returned. This can be used to optimize performance ( construction of an event object can be avoided ). ***/ - inline OInterfaceContainerHelper * SAL_CALL getContainer( const keyType &key ) const SAL_THROW( () ) + inline OInterfaceContainerHelper * SAL_CALL getContainer( const keyType &key ) const SAL_THROW(()) { return aLC.getContainer( key ); } }; @@ -508,7 +508,7 @@ struct OBroadcastHelperVar // helper function call class struct hashType_Impl { - size_t operator()(const ::com::sun::star::uno::Type & s) const SAL_THROW( () ) + size_t operator()(const ::com::sun::star::uno::Type & s) const SAL_THROW(()) { return s.getTypeName().hashCode(); } }; @@ -520,13 +520,13 @@ class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelper { public: // 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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) {} /** @@ -536,23 +536,23 @@ public: The lifetime must be longer than the lifetime of this object. */ - OMultiTypeInterfaceContainerHelper( ::osl::Mutex & ) SAL_THROW( () ); + OMultiTypeInterfaceContainerHelper( ::osl::Mutex & ) SAL_THROW(()); /** Delete all containers. */ - ~OMultiTypeInterfaceContainerHelper() SAL_THROW( () ); + ~OMultiTypeInterfaceContainerHelper() SAL_THROW(()); /** Return all id's under which at least one interface is added. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getContainedTypes() const SAL_THROW( () ); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getContainedTypes() const SAL_THROW(()); /** Return the container created under this key. @return the container created under this key. If the container was not created, null was returned. */ - OInterfaceContainerHelper * SAL_CALL getContainer( const ::com::sun::star::uno::Type & rKey ) const SAL_THROW( () ); + OInterfaceContainerHelper * SAL_CALL getContainer( const ::com::sun::star::uno::Type & rKey ) const SAL_THROW(()); /** Inserts an element into the container with the specified key. The position is not specified, thus it is not specified in which order events are fired. @@ -575,7 +575,7 @@ public: sal_Int32 SAL_CALL addInterface( const ::com::sun::star::uno::Type & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r ) - SAL_THROW( () ); + SAL_THROW(()); /** Removes an element from the container with the specified key. It uses interface equality to remove the interface. @@ -590,25 +590,25 @@ public: sal_Int32 SAL_CALL removeInterface( const ::com::sun::star::uno::Type & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) - SAL_THROW( () ); + SAL_THROW(()); /** Call disposing on all object in the container that support XEventListener. Than clear the container. */ - void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ); + void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW(()); /** Remove all elements of all containers. Does not delete the container. */ - void SAL_CALL clear() SAL_THROW( () ); + void SAL_CALL clear() SAL_THROW(()); typedef ::com::sun::star::uno::Type keyType; private: void *m_pMap; ::osl::Mutex & rMutex; - inline OMultiTypeInterfaceContainerHelper( const OMultiTypeInterfaceContainerHelper & ) SAL_THROW( () ); - inline OMultiTypeInterfaceContainerHelper & operator = ( const OMultiTypeInterfaceContainerHelper & ) SAL_THROW( () ); + inline OMultiTypeInterfaceContainerHelper( const OMultiTypeInterfaceContainerHelper & ) SAL_THROW(()); + inline OMultiTypeInterfaceContainerHelper & operator = ( const OMultiTypeInterfaceContainerHelper & ) SAL_THROW(()); }; typedef OBroadcastHelperVar< OMultiTypeInterfaceContainerHelper , OMultiTypeInterfaceContainerHelper::keyType > OBroadcastHelper; diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx index d9c347ecc0cf..74c264b9fddc 100644 --- a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx +++ b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx @@ -36,7 +36,7 @@ namespace cppu template< class key , class hashImpl , class equalImpl > inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::OMultiTypeInterfaceContainerHelperVar( ::osl::Mutex & rMutex_ ) - SAL_THROW( () ) + SAL_THROW(()) : rMutex( rMutex_ ) { m_pMap = new InterfaceMap; @@ -45,7 +45,7 @@ inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::OMul //=================================================================== template< class key , class hashImpl , class equalImpl > inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::~OMultiTypeInterfaceContainerHelperVar() - SAL_THROW( () ) + SAL_THROW(()) { typename InterfaceMap::iterator iter = m_pMap->begin(); typename InterfaceMap::iterator end = m_pMap->end(); @@ -62,7 +62,7 @@ inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::~OMu //=================================================================== template< class key , class hashImpl , class equalImpl > inline ::com::sun::star::uno::Sequence< key > OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainedTypes() const - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); typename InterfaceMap::size_type nSize = m_pMap->size(); @@ -95,7 +95,7 @@ inline ::com::sun::star::uno::Sequence< key > OMultiTypeInterfaceContainerHelper //=================================================================== template< class key , class hashImpl , class equalImpl > OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainer( - const key & rKey ) const SAL_THROW( () ) + const key & rKey ) const SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); @@ -110,7 +110,7 @@ template< class key , class hashImpl , class equalImpl > sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::addInterface( const key & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); typename InterfaceMap::iterator iter = find( rKey ); @@ -129,7 +129,7 @@ template< class key , class hashImpl , class equalImpl > inline sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::removeInterface( const key & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); @@ -147,7 +147,7 @@ inline sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalIm template< class key , class hashImpl , class equalImpl > void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) - SAL_THROW( () ) + SAL_THROW(()) { typename InterfaceMap::size_type nSize = 0; OInterfaceContainerHelper ** ppListenerContainers = NULL; @@ -183,7 +183,7 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::dispos //=================================================================== template< class key , class hashImpl , class equalImpl > -void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::clear() SAL_THROW( () ) +void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::clear() SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); typename InterfaceMap::iterator iter = m_pMap->begin(); diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx index 00ff4d0b2f50..4b0112679f10 100644 --- a/cppuhelper/inc/cppuhelper/propshlp.hxx +++ b/cppuhelper/inc/cppuhelper/propshlp.hxx @@ -57,13 +57,13 @@ class CPPUHELPER_DLLPUBLIC IPropertyArrayHelper { public: // 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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) {} /** @@ -135,7 +135,7 @@ public: ::com::sun::star::beans::Property *pProps, sal_Int32 nElements , sal_Bool bSorted = sal_True ) - SAL_THROW( () ); + SAL_THROW(()); /** Create an object which supports the common property interfaces. @@ -146,12 +146,12 @@ public: OPropertyArrayHelper( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > & aProps, sal_Bool bSorted = sal_True ) - SAL_THROW( () ); + SAL_THROW(()); /** Return the number of properties. */ - sal_Int32 SAL_CALL getCount() const SAL_THROW( () ); + sal_Int32 SAL_CALL getCount() const SAL_THROW(()); /** Return the property members Name and Attribute from the handle nHandle. @param nHandle the handle of a property. If the values of the handles @@ -203,7 +203,7 @@ protected: void * m_pReserved; private: - void init( sal_Bool bSorted ) SAL_THROW( () ); + void init( sal_Bool bSorted ) SAL_THROW(()); /** The sequence generated from the pProperties array. */ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aInfos; @@ -221,13 +221,13 @@ private: struct equalInt32_Impl { - bool operator()(const sal_Int32 & i1 , const sal_Int32 & i2) const SAL_THROW( () ) + bool operator()(const sal_Int32 & i1 , const sal_Int32 & i2) const SAL_THROW(()) { return i1 == i2; } }; struct hashInt32_Impl { - size_t operator()(const sal_Int32 & i) const SAL_THROW( () ) + size_t operator()(const sal_Int32 & i) const SAL_THROW(()) { return i; } }; /** Specialized class for key type sal_Int32, @@ -237,13 +237,13 @@ class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelperInt32 { public: // 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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) {} /** @@ -253,23 +253,23 @@ public: The lifetime must be longer than the lifetime of this object. */ - OMultiTypeInterfaceContainerHelperInt32( ::osl::Mutex & ) SAL_THROW( () ); + OMultiTypeInterfaceContainerHelperInt32( ::osl::Mutex & ) SAL_THROW(()); /** Delete all containers. */ - ~OMultiTypeInterfaceContainerHelperInt32() SAL_THROW( () ); + ~OMultiTypeInterfaceContainerHelperInt32() SAL_THROW(()); /** Return all id's under which at least one interface is added. */ - ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getContainedTypes() const SAL_THROW( () ); + ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getContainedTypes() const SAL_THROW(()); /** Return the container created under this key. @return the container created under this key. If the container was not created, null was returned. */ - OInterfaceContainerHelper * SAL_CALL getContainer( const sal_Int32 & rKey ) const SAL_THROW( () ); + OInterfaceContainerHelper * SAL_CALL getContainer( const sal_Int32 & rKey ) const SAL_THROW(()); /** Insert an element in the container specified with the key. The position is not specified. @@ -281,7 +281,7 @@ public: sal_Int32 SAL_CALL addInterface( const sal_Int32 & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r ) - SAL_THROW( () ); + SAL_THROW(()); /** Remove an element from the container specified with the key. @@ -293,25 +293,25 @@ public: sal_Int32 SAL_CALL removeInterface( const sal_Int32 & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) - SAL_THROW( () ); + SAL_THROW(()); /** Call disposing on all objects in the container that support XEventListener. Then clear the container. */ - void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ); + void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW(()); /** Remove all elements of all containers. Does not delete the container. */ - void SAL_CALL clear() SAL_THROW( () ); + void SAL_CALL clear() SAL_THROW(()); typedef sal_Int32 keyType; private: void *m_pMap; ::osl::Mutex & rMutex; - inline OMultiTypeInterfaceContainerHelperInt32( const OMultiTypeInterfaceContainerHelperInt32 & ) SAL_THROW( () ); - inline OMultiTypeInterfaceContainerHelperInt32 & operator = ( const OMultiTypeInterfaceContainerHelperInt32 & ) SAL_THROW( () ); + inline OMultiTypeInterfaceContainerHelperInt32( const OMultiTypeInterfaceContainerHelperInt32 & ) SAL_THROW(()); + inline OMultiTypeInterfaceContainerHelperInt32 & operator = ( const OMultiTypeInterfaceContainerHelperInt32 & ) SAL_THROW(()); }; @@ -362,7 +362,7 @@ public: The lifetime must be longer than the lifetime of this object. Stored in the variable rBHelper. */ - OPropertySetHelper( OBroadcastHelper & rBHelper ) SAL_THROW( () ); + OPropertySetHelper( OBroadcastHelper & rBHelper ) SAL_THROW(()); /** Constructor. @@ -429,7 +429,7 @@ public: @see OComponentHelper */ - void SAL_CALL disposing() SAL_THROW( () ); + void SAL_CALL disposing() SAL_THROW(()); /** Throw UnknownPropertyException or PropertyVetoException if the property with the name @@ -513,7 +513,7 @@ public: The property sequence is created in the call. The interface isn't used after the call. */ static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL - createPropertySetInfo( IPropertyArrayHelper & rProperties ) SAL_THROW( () ); + createPropertySetInfo( IPropertyArrayHelper & rProperties ) SAL_THROW(()); protected: /** This method fire events to all registered property listeners. @@ -643,8 +643,8 @@ protected: const std::auto_ptr<Impl> m_pReserved; private: - OPropertySetHelper( const OPropertySetHelper & ) SAL_THROW( () ); - OPropertySetHelper & operator = ( const OPropertySetHelper & ) SAL_THROW( () ); + OPropertySetHelper( const OPropertySetHelper & ) SAL_THROW(()); + OPropertySetHelper & operator = ( const OPropertySetHelper & ) SAL_THROW(()); /** notifies the given changes in property's values, <em>plus</em> all property changes collected during recent |setDependentFastPropertyValue| calls. @@ -667,7 +667,7 @@ public: /** You must call disposing before destruction. */ - ~OPropertySetHelper() SAL_THROW( () ); + ~OPropertySetHelper() SAL_THROW(()); }; #if defined _MSC_VER #pragma warning(pop) @@ -700,15 +700,15 @@ public: private: - OPropertySetHelper2( const OPropertySetHelper2 & ) SAL_THROW( () ); - OPropertySetHelper2 & operator = ( const OPropertySetHelper2 & ) SAL_THROW( () ); + OPropertySetHelper2( const OPropertySetHelper2 & ) SAL_THROW(()); + OPropertySetHelper2 & operator = ( const OPropertySetHelper2 & ) SAL_THROW(()); public: // Suppress warning about virtual functions but non-virtual destructor: /** You must call disposing before destruction. */ - virtual ~OPropertySetHelper2() SAL_THROW( () ); + virtual ~OPropertySetHelper2() SAL_THROW(()); }; } // end namespace cppuhelper diff --git a/cppuhelper/inc/cppuhelper/queryinterface.hxx b/cppuhelper/inc/cppuhelper/queryinterface.hxx index 4717eacce33c..8bbb56038051 100644 --- a/cppuhelper/inc/cppuhelper/queryinterface.hxx +++ b/cppuhelper/inc/cppuhelper/queryinterface.hxx @@ -48,7 +48,7 @@ template< class Interface1 > inline ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType, Interface1 * p1 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); @@ -68,7 +68,7 @@ template< class Interface1, class Interface2 > inline ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); @@ -92,7 +92,7 @@ template< class Interface1, class Interface2, class Interface3 > inline ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); @@ -120,7 +120,7 @@ template< class Interface1, class Interface2, class Interface3, class Interface4 inline ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); @@ -152,7 +152,7 @@ template< class Interface1, class Interface2, class Interface3, class Interface4 inline ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); @@ -190,7 +190,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); @@ -232,7 +232,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); @@ -278,7 +278,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); @@ -328,7 +328,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); @@ -382,7 +382,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); @@ -442,7 +442,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10, Interface11 * p11 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); @@ -506,7 +506,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10, Interface11 * p11, Interface12 * p12 ) - SAL_THROW( () ) + SAL_THROW(()) { if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); diff --git a/cppuhelper/inc/cppuhelper/stdidlclass.hxx b/cppuhelper/inc/cppuhelper/stdidlclass.hxx index 6879adf6f743..750057fef12e 100644 --- a/cppuhelper/inc/cppuhelper/stdidlclass.hxx +++ b/cppuhelper/inc/cppuhelper/stdidlclass.hxx @@ -44,7 +44,7 @@ CPPUHELPER_DLLPUBLIC ::com::sun::star::reflection::XIdlClass * SAL_CALL createSt const ::rtl::OUString & sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & rSuperClass, const ::com::sun::star::uno::Sequence < ::rtl::OUString > &seq ) - SAL_THROW( () ); + SAL_THROW(()); @@ -69,7 +69,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star:: const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & , const Interface1 * ) - SAL_THROW( () ) + SAL_THROW(()) { return 0; } @@ -85,7 +85,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star:: const Interface1 *, const Interface2 * ) - SAL_THROW( () ) + SAL_THROW(()) { return 0; } @@ -104,7 +104,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star:: const Interface2 *, const Interface3 * ) - SAL_THROW( () ) + SAL_THROW(()) { return 0; } @@ -124,7 +124,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star:: const Interface3 *, const Interface4 * ) - SAL_THROW( () ) + SAL_THROW(()) { return 0; } @@ -147,7 +147,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star:: const Interface4 *, const Interface5 * ) - SAL_THROW( () ) + SAL_THROW(()) { return 0; } @@ -169,7 +169,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star:: const Interface5 *, const Interface6 * ) - SAL_THROW( () ) + SAL_THROW(()) { return 0; } @@ -193,7 +193,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star:: const Interface6 *, const Interface7 * ) - SAL_THROW( () ) + SAL_THROW(()) { return 0; } @@ -219,7 +219,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star:: const Interface7 *, const Interface8 * ) - SAL_THROW( () ) + SAL_THROW(()) { return 0; } @@ -244,7 +244,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star:: const Interface8 *, const Interface9 * ) - SAL_THROW( () ) + SAL_THROW(()) { return 0; } @@ -268,7 +268,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star:: const Interface9 *, const Interface10 * ) - SAL_THROW( () ) + SAL_THROW(()) { return 0; } diff --git a/cppuhelper/inc/cppuhelper/typeprovider.hxx b/cppuhelper/inc/cppuhelper/typeprovider.hxx index af813e570d03..8bcf9272ceeb 100644 --- a/cppuhelper/inc/cppuhelper/typeprovider.hxx +++ b/cppuhelper/inc/cppuhelper/typeprovider.hxx @@ -47,42 +47,42 @@ class CPPUHELPER_DLLPUBLIC OTypeCollection public: /// @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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) {} /// @endcond inline OTypeCollection( const OTypeCollection & rCollection ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( rCollection._aTypes ) {} OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Type & rType2, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Type & rType2, const ::com::sun::star::uno::Type & rType3, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Type & rType2, const ::com::sun::star::uno::Type & rType3, const ::com::sun::star::uno::Type & rType4, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Type & rType2, @@ -90,7 +90,7 @@ public: const ::com::sun::star::uno::Type & rType4, const ::com::sun::star::uno::Type & rType5, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Type & rType2, @@ -99,7 +99,7 @@ public: const ::com::sun::star::uno::Type & rType5, const ::com::sun::star::uno::Type & rType6, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Type & rType2, @@ -109,7 +109,7 @@ public: const ::com::sun::star::uno::Type & rType6, const ::com::sun::star::uno::Type & rType7, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Type & rType2, @@ -120,7 +120,7 @@ public: const ::com::sun::star::uno::Type & rType7, const ::com::sun::star::uno::Type & rType8, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Type & rType2, @@ -132,7 +132,7 @@ public: const ::com::sun::star::uno::Type & rType8, const ::com::sun::star::uno::Type & rType9, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Type & rType2, @@ -145,7 +145,7 @@ public: const ::com::sun::star::uno::Type & rType9, const ::com::sun::star::uno::Type & rType10, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Type & rType2, @@ -159,7 +159,7 @@ public: const ::com::sun::star::uno::Type & rType10, const ::com::sun::star::uno::Type & rType11, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); OTypeCollection( const ::com::sun::star::uno::Type & rType1, const ::com::sun::star::uno::Type & rType2, @@ -174,13 +174,13 @@ public: const ::com::sun::star::uno::Type & rType11, const ::com::sun::star::uno::Type & rType12, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ) - SAL_THROW( () ); + SAL_THROW(()); /** Called upon XTypeProvider::getTypes(). @return type collection */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() SAL_THROW( () ) + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() SAL_THROW(()) { return _aTypes; } }; @@ -196,16 +196,16 @@ public: /// @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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) {} - ~OImplementationId() SAL_THROW( () ); + ~OImplementationId() SAL_THROW(()); /// @endcond @@ -213,7 +213,7 @@ public: @param bUseEthernetAddress whether an ethernet mac address should be taken into account */ - inline OImplementationId( sal_Bool bUseEthernetAddress = sal_True ) SAL_THROW( () ) + inline OImplementationId( sal_Bool bUseEthernetAddress = sal_True ) SAL_THROW(()) : _pSeq( 0 ) , _bUseEthernetAddress( bUseEthernetAddress ) {} @@ -221,10 +221,10 @@ public: @param rSeq implementation id */ - inline OImplementationId( const ::com::sun::star::uno::Sequence< sal_Int8 > & rSeq ) SAL_THROW( () ) + inline OImplementationId( const ::com::sun::star::uno::Sequence< sal_Int8 > & rSeq ) SAL_THROW(()) : _pSeq( new ::com::sun::star::uno::Sequence< sal_Int8 >( rSeq ) ) {} - inline OImplementationId( const OImplementationId & rId ) SAL_THROW( () ) + inline OImplementationId( const OImplementationId & rId ) SAL_THROW(()) : _pSeq( new ::com::sun::star::uno::Sequence< sal_Int8 >( rId.getImplementationId() ) ) {} @@ -232,7 +232,7 @@ public: @return implementation id */ - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() const SAL_THROW( () ); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() const SAL_THROW(()); }; } diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx index ceddbda9c411..8838797dfe5d 100644 --- a/cppuhelper/inc/cppuhelper/weak.hxx +++ b/cppuhelper/inc/cppuhelper/weak.hxx @@ -90,13 +90,13 @@ protected: public: /// @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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) {} /// @endcond @@ -104,11 +104,11 @@ public: /** Default Constructor. Sets the reference count to zero. Accidentally occurs in msvc mapfile = > had to be outlined. */ - OWeakObject() SAL_THROW( () ); + OWeakObject() SAL_THROW(()); #else /** Default Constructor. Sets the reference count to zero. */ - inline OWeakObject() SAL_THROW( () ) + inline OWeakObject() SAL_THROW(()) : m_refCount( 0 ) , m_pWeakConnectionPoint( 0 ) {} @@ -117,7 +117,7 @@ public: @param rObj dummy param */ - inline OWeakObject( const OWeakObject & ) SAL_THROW( () ) + inline OWeakObject( const OWeakObject & ) SAL_THROW(()) : com::sun::star::uno::XWeak() , m_refCount( 0 ) , m_pWeakConnectionPoint( 0 ) @@ -127,7 +127,7 @@ public: @return this OWeakObject */ inline OWeakObject & SAL_CALL operator = ( const OWeakObject &) - SAL_THROW( () ) + SAL_THROW(()) { return *this; } /** Basic queryInterface() implementation supporting \::com::sun::star::uno::XWeak and @@ -159,7 +159,7 @@ public: @return XInterface reference */ - inline SAL_CALL operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > () SAL_THROW( () ) + inline SAL_CALL operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > () SAL_THROW(()) { return this; } }; diff --git a/cppuhelper/inc/cppuhelper/weakagg.hxx b/cppuhelper/inc/cppuhelper/weakagg.hxx index 150cfd1b1aa4..094e178ec222 100644 --- a/cppuhelper/inc/cppuhelper/weakagg.hxx +++ b/cppuhelper/inc/cppuhelper/weakagg.hxx @@ -53,7 +53,7 @@ class CPPUHELPER_DLLPUBLIC OWeakAggObject public: /** Constructor. No delegator set. */ - inline OWeakAggObject() SAL_THROW( () ) + inline OWeakAggObject() SAL_THROW(()) {} /** If a delegator is set, then the delegators gets acquired. Otherwise call is delegated to @@ -102,8 +102,8 @@ protected: */ ::com::sun::star::uno::WeakReferenceHelper xDelegator; private: - OWeakAggObject( const OWeakAggObject & rObj ) SAL_THROW( () ); - OWeakAggObject & operator = ( const OWeakAggObject & rObj ) SAL_THROW( () ); + OWeakAggObject( const OWeakAggObject & rObj ) SAL_THROW(()); + OWeakAggObject & operator = ( const OWeakAggObject & rObj ) SAL_THROW(()); }; } diff --git a/cppuhelper/inc/cppuhelper/weakref.hxx b/cppuhelper/inc/cppuhelper/weakref.hxx index 1e8362a19b23..73c8ee24e76f 100644 --- a/cppuhelper/inc/cppuhelper/weakref.hxx +++ b/cppuhelper/inc/cppuhelper/weakref.hxx @@ -51,7 +51,7 @@ class CPPUHELPER_DLLPUBLIC WeakReferenceHelper public: /** Default ctor. Creates an empty weak reference. */ - inline WeakReferenceHelper() SAL_THROW( () ) + inline WeakReferenceHelper() SAL_THROW(()) : m_pImpl( 0 ) {} @@ -59,23 +59,23 @@ public: @param rWeakRef another weak ref */ - WeakReferenceHelper( const WeakReferenceHelper & rWeakRef ) SAL_THROW( () ); + WeakReferenceHelper( const WeakReferenceHelper & rWeakRef ) SAL_THROW(()); /** Initialize this reference with the hard interface reference xInt. If the implementation behind xInt does not support XWeak or XInt is null then this reference will be null. @param xInt another hard interface reference */ WeakReferenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xInt ) - SAL_THROW( () ); + SAL_THROW(()); /** Releases this reference. */ - ~WeakReferenceHelper() SAL_THROW( () ); + ~WeakReferenceHelper() SAL_THROW(()); /** Releases this reference and takes over rWeakRef. @param rWeakRef another weak ref */ - WeakReferenceHelper & SAL_CALL operator = ( const WeakReferenceHelper & rWeakRef ) SAL_THROW( () ); + WeakReferenceHelper & SAL_CALL operator = ( const WeakReferenceHelper & rWeakRef ) SAL_THROW(()); /** Releases this reference and takes over hard reference xInt. If the implementation behind xInt does not support XWeak @@ -85,33 +85,33 @@ public: */ WeakReferenceHelper & SAL_CALL operator = ( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > & xInt ) SAL_THROW( () ); + ::com::sun::star::uno::XInterface > & xInt ) SAL_THROW(()); /** Returns true if both weak refs reference to the same object. @param rObj another weak ref @return true, if both weak refs reference to the same object. */ - inline sal_Bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const SAL_THROW( () ) + inline sal_Bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const SAL_THROW(()) { return (get() == rObj.get()); } /** Gets a hard reference to the object. @return hard reference or null, if the weakly referenced interface has gone */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL get() const SAL_THROW( () ); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL get() const SAL_THROW(()); /** Gets a hard reference to the object. @return hard reference or null, if the weakly referenced interface has gone */ - inline SAL_CALL operator Reference< XInterface > () const SAL_THROW( () ) + inline SAL_CALL operator Reference< XInterface > () const SAL_THROW(()) { return get(); } /** Releases this reference. @since UDK 3.2.12 */ - void SAL_CALL clear() SAL_THROW( () ); + void SAL_CALL clear() SAL_THROW(()); protected: /// @cond INTERNAL @@ -130,7 +130,7 @@ class WeakReference : public WeakReferenceHelper public: /** Default ctor. Creates an empty weak reference. */ - inline WeakReference() SAL_THROW( () ) + inline WeakReference() SAL_THROW(()) : WeakReferenceHelper() {} @@ -138,7 +138,7 @@ public: @param rRef another hard ref */ - inline WeakReference( const Reference< interface_type > & rRef ) SAL_THROW( () ) + inline WeakReference( const Reference< interface_type > & rRef ) SAL_THROW(()) : WeakReferenceHelper( rRef ) {} @@ -152,14 +152,14 @@ public: */ WeakReference & SAL_CALL operator = ( const ::com::sun::star::uno::Reference< interface_type > & xInt ) - SAL_THROW( () ) + SAL_THROW(()) { WeakReferenceHelper::operator=(xInt); return *this; } /** Gets a hard reference to the object. @return hard reference or null, if the weakly referenced interface has gone */ - inline SAL_CALL operator Reference< interface_type > () const SAL_THROW( () ) + inline SAL_CALL operator Reference< interface_type > () const SAL_THROW(()) { return Reference< interface_type >::query( get() ); } }; diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 063bece4d8a0..39e44feda2e5 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -93,7 +93,7 @@ OUString const & get_this_libpath() return s_path; } -Bootstrap const & get_unorc() SAL_THROW( () ) +Bootstrap const & get_unorc() SAL_THROW(()) { static rtlBootstrapHandle s_bstrap = 0; if (! s_bstrap) @@ -142,7 +142,7 @@ Reference< XComponentContext > bootstrapInitialContext( Reference< XComponentContext > SAL_CALL createInitialCfgComponentContext( ContextEntry_Init const * pEntries, sal_Int32 nEntries, Reference< XComponentContext > const & xDelegate ) - SAL_THROW( () ); + SAL_THROW(()); Reference< registry::XSimpleRegistry > SAL_CALL createRegistryWrapper( const Reference< XComponentContext >& xContext ); @@ -152,7 +152,7 @@ namespace { template< class T > inline beans::PropertyValue createPropertyValue( OUString const & name, T const & value ) - SAL_THROW( () ) + SAL_THROW(()) { return beans::PropertyValue( name, -1, makeAny( value ), beans::PropertyState_DIRECT_VALUE ); diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx index a4e797706199..1cc7c2fdd79b 100644 --- a/cppuhelper/source/component.cxx +++ b/cppuhelper/source/component.cxx @@ -49,7 +49,7 @@ namespace cppu // class OComponentHelper // ---------------------------------------------------- -OComponentHelper::OComponentHelper( Mutex & rMutex ) SAL_THROW( () ) +OComponentHelper::OComponentHelper( Mutex & rMutex ) SAL_THROW(()) : rBHelper( rMutex ) { } diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index da60e39152b7..6c795dec88cc 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -302,7 +302,7 @@ class DisposingForwarder Reference< lang::XComponent > m_xTarget; inline DisposingForwarder( Reference< lang::XComponent > const & xTarget ) - SAL_THROW( () ) + SAL_THROW(()) : m_xTarget( xTarget ) { OSL_ASSERT( m_xTarget.is() ); } public: @@ -375,7 +375,7 @@ public: ContextEntry_Init const * pEntries, sal_Int32 nEntries, Reference< XComponentContext > const & xDelegate ); virtual ~ComponentContext() - SAL_THROW( () ); + SAL_THROW(()); // XComponentContext virtual Any SAL_CALL getValueByName( OUString const & rName ) @@ -676,7 +676,7 @@ Reference< lang::XMultiComponentFactory > ComponentContext::getServiceManager() } //__________________________________________________________________________________________________ ComponentContext::~ComponentContext() - SAL_THROW( () ) + SAL_THROW(()) { #ifdef CONTEXT_DIAG ::fprintf( stderr, "> destructed context %p\n", this ); @@ -865,7 +865,7 @@ 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( () ) + SAL_THROW(()) { uno::Environment curr_env(Environment::getCurrent()); uno::Environment source_env(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))); diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 4a298d1cb188..dc46aa8a09f5 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -80,7 +80,7 @@ public: ComponentInstantiation pCreateFunction_, ComponentFactoryFunc fptr, const Sequence< OUString > * pServiceNames_ ) - SAL_THROW( () ) + SAL_THROW(()) : xSMgr( rServiceManager ) , pCreateFunction( pCreateFunction_ ) , m_fptr( fptr ) @@ -94,7 +94,7 @@ public: OSingleFactoryHelper( const Reference<XMultiServiceFactory > & rServiceManager, const OUString & rImplementationName_ ) - SAL_THROW( () ) + SAL_THROW(()) : xSMgr( rServiceManager ) , pCreateFunction( NULL ) , m_fptr( 0 ) @@ -292,7 +292,7 @@ public: ComponentFactoryFunc fptr, const Sequence< OUString > * pServiceNames_, sal_Bool bOneInstance_ = sal_False ) - SAL_THROW( () ) + SAL_THROW(()) : OComponentHelper( aMutex ) , OSingleFactoryHelper( rServiceManager, rImplementationName_, pCreateFunction_, fptr, pServiceNames_ ) , bOneInstance( bOneInstance_ ) @@ -310,7 +310,7 @@ public: const Sequence< OUString > * pServiceNames_, rtl_ModuleCount * pModCount, sal_Bool bOneInstance_ = sal_False ) - SAL_THROW( () ) + SAL_THROW(()) : OComponentHelper( aMutex ) , OSingleFactoryHelper( rServiceManager, rImplementationName_, pCreateFunction_, fptr, pServiceNames_ ) , bOneInstance( bOneInstance_ ) @@ -325,7 +325,7 @@ public: const Reference<XMultiServiceFactory > & rServiceManager, const OUString & rImplementationName_, sal_Bool bOneInstance_ = sal_False ) - SAL_THROW( () ) + SAL_THROW(()) : OComponentHelper( aMutex ) , OSingleFactoryHelper( rServiceManager, rImplementationName_ ) , bOneInstance( bOneInstance_ ) @@ -551,7 +551,7 @@ public: const Reference<XMultiServiceFactory > & rServiceManager, const OUString & rImplementationName_, const Reference<XRegistryKey > & xImplementationKey_, - sal_Bool bOneInstance_ = sal_False ) SAL_THROW( () ) + sal_Bool bOneInstance_ = sal_False ) SAL_THROW(()) : OFactoryComponentHelper( rServiceManager, rImplementationName_, 0, 0, 0, bOneInstance_ ), OPropertySetHelper( OComponentHelper::rBHelper ), @@ -957,7 +957,7 @@ class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleService public: OFactoryProxyHelper( const Reference<XSingleServiceFactory > & rFactory ) - SAL_THROW( () ) + SAL_THROW(()) : xFactory( rFactory ) {} @@ -1043,7 +1043,7 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleFactory( ComponentInstantiation pCreateFunction, const Sequence< OUString > & rServiceNames, rtl_ModuleCount *pModCount ) - SAL_THROW( () ) + SAL_THROW(()) { return new OFactoryComponentHelper( rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, pModCount, sal_False ); @@ -1053,7 +1053,7 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleFactory( Reference<XSingleServiceFactory > SAL_CALL createFactoryProxy( SAL_UNUSED_PARAMETER const Reference<XMultiServiceFactory > &, const Reference<XSingleServiceFactory > & rFactory ) - SAL_THROW( () ) + SAL_THROW(()) { return new OFactoryProxyHelper( rFactory ); } @@ -1065,7 +1065,7 @@ Reference<XSingleServiceFactory > SAL_CALL createOneInstanceFactory( ComponentInstantiation pCreateFunction, const Sequence< OUString > & rServiceNames, rtl_ModuleCount *pModCount ) - SAL_THROW( () ) + SAL_THROW(()) { return new OFactoryComponentHelper( rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, pModCount, sal_True ); @@ -1076,7 +1076,7 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleRegistryFactory( const Reference<XMultiServiceFactory > & rServiceManager, const OUString & rImplementationName, const Reference<XRegistryKey > & rImplementationKey ) - SAL_THROW( () ) + SAL_THROW(()) { return new ORegistryFactoryHelper( rServiceManager, rImplementationName, rImplementationKey, sal_False ); @@ -1087,7 +1087,7 @@ Reference<XSingleServiceFactory > SAL_CALL createOneInstanceRegistryFactory( const Reference<XMultiServiceFactory > & rServiceManager, const OUString & rImplementationName, const Reference<XRegistryKey > & rImplementationKey ) - SAL_THROW( () ) + SAL_THROW(()) { return new ORegistryFactoryHelper( rServiceManager, rImplementationName, rImplementationKey, sal_True ); @@ -1099,7 +1099,7 @@ Reference< lang::XSingleComponentFactory > SAL_CALL createSingleComponentFactory OUString const & rImplementationName, Sequence< OUString > const & rServiceNames, rtl_ModuleCount * pModCount) - SAL_THROW( () ) + SAL_THROW(()) { return new OFactoryComponentHelper( Reference< XMultiServiceFactory >(), rImplementationName, 0, fptr, &rServiceNames, pModCount, sal_False ); @@ -1110,7 +1110,7 @@ Reference< lang::XSingleComponentFactory > SAL_CALL createOneInstanceComponentFa OUString const & rImplementationName, Sequence< OUString > const & rServiceNames, rtl_ModuleCount * pModCount) - SAL_THROW( () ) + SAL_THROW(()) { return new OFactoryComponentHelper( Reference< XMultiServiceFactory >(), rImplementationName, 0, fptr, &rServiceNames, pModCount, sal_True ); diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index 4738870b69e5..fbe7ed69b79c 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -48,14 +48,14 @@ namespace namespace cppu { //================================================================================================== -Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () ) +Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(()) { return theImplHelperInitMutex::get(); } // ClassDataBase //__________________________________________________________________________________________________ -ClassDataBase::ClassDataBase() SAL_THROW( () ) +ClassDataBase::ClassDataBase() SAL_THROW(()) : bOffsetsInit( sal_False ) , nType2Offset( 0 ) , nClassCode( 0 ) @@ -64,7 +64,7 @@ ClassDataBase::ClassDataBase() SAL_THROW( () ) { } //__________________________________________________________________________________________________ -ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW( () ) +ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW(()) : bOffsetsInit( sal_False ) , nType2Offset( 0 ) , nClassCode( nClassCode_ ) @@ -73,7 +73,7 @@ ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW( () ) { } //__________________________________________________________________________________________________ -ClassDataBase::~ClassDataBase() SAL_THROW( () ) +ClassDataBase::~ClassDataBase() SAL_THROW(()) { delete pTypes; delete pId; @@ -87,7 +87,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 ) SAL_THROW(()) { arType2Offset[nType2Offset].nOffset = nOffset; @@ -107,7 +107,7 @@ void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THR #endif } //__________________________________________________________________________________________________ -void ClassData::initTypeProvider() SAL_THROW( () ) +void ClassData::initTypeProvider() SAL_THROW(()) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if (! pTypes) @@ -148,14 +148,14 @@ void ClassData::initTypeProvider() SAL_THROW( () ) } } //__________________________________________________________________________________________________ -Sequence< Type > ClassData::getTypes() SAL_THROW( () ) +Sequence< Type > ClassData::getTypes() SAL_THROW(()) { if (! pTypes) initTypeProvider(); return *pTypes; } //__________________________________________________________________________________________________ -Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW( () ) +Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW(()) { if (! pTypes) initTypeProvider(); @@ -165,14 +165,14 @@ Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW( () ) //-------------------------------------------------------------------------------------------------- static inline sal_Bool td_equals( typelib_TypeDescription * pTD, typelib_TypeDescriptionReference * pType ) - SAL_THROW( () ) + 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 ) SAL_THROW(()) { if (rType == ::getCppuType( (const Reference< XInterface > *)0 )) return Any( &pBase, ::getCppuType( (const Reference< XInterface > *)0 ) ); @@ -204,13 +204,13 @@ Any ClassData::query( const Type & rType, lang::XTypeProvider * pBase ) SAL_THRO // WeakComponentImplHelperBase //__________________________________________________________________________________________________ WeakComponentImplHelperBase::WeakComponentImplHelperBase( Mutex & rMutex ) - SAL_THROW( () ) + SAL_THROW(()) : rBHelper( rMutex ) { } //__________________________________________________________________________________________________ WeakComponentImplHelperBase::~WeakComponentImplHelperBase() - SAL_THROW( () ) + SAL_THROW(()) { } //__________________________________________________________________________________________________ @@ -330,13 +330,13 @@ void WeakComponentImplHelperBase::removeEventListener( // WeakAggComponentImplHelperBase //__________________________________________________________________________________________________ WeakAggComponentImplHelperBase::WeakAggComponentImplHelperBase( Mutex & rMutex ) - SAL_THROW( () ) + SAL_THROW(()) : rBHelper( rMutex ) { } //__________________________________________________________________________________________________ WeakAggComponentImplHelperBase::~WeakAggComponentImplHelperBase() - SAL_THROW( () ) + SAL_THROW(()) { } //__________________________________________________________________________________________________ diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index 720ab0d35479..2e5e9523eb3a 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -49,7 +49,7 @@ 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) SAL_THROW(()); //-------------------------------------------------------------------------------------------------- static inline void checkInterface( Type const & rType ) @@ -70,12 +70,12 @@ static inline void checkInterface( Type const & rType ) } } //-------------------------------------------------------------------------------------------------- -static inline bool isXInterface( rtl_uString * pStr ) SAL_THROW( () ) +static inline bool isXInterface( rtl_uString * pStr ) SAL_THROW(()) { return (((OUString const *)&pStr)->equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) != sal_False); } //-------------------------------------------------------------------------------------------------- -static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW( () ) +static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW(()) { return (((char *)that) + nOffset); } @@ -83,7 +83,7 @@ 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( () ) + SAL_THROW(()) { return ((pTDR1 == pTDR2) || ((OUString const *)&pTDR1->pTypeName)->equals( *(OUString const *)&pTDR2->pTypeName ) != sal_False); diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx index 58150c47fa3e..510d25f35c20 100644 --- a/cppuhelper/source/interfacecontainer.cxx +++ b/cppuhelper/source/interfacecontainer.cxx @@ -49,7 +49,7 @@ namespace cppu * Reallocate the sequence. */ static void realloc( Sequence< Reference< XInterface > > & rSeq, sal_Int32 nNewLen ) - SAL_THROW( () ) + SAL_THROW(()) { rSeq.realloc( nNewLen ); } @@ -58,7 +58,7 @@ 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_THROW(()) { sal_Int32 nNewLen = rSeq.getLength() - 1; @@ -79,7 +79,7 @@ static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > & rSeq, #endif OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont_ ) - SAL_THROW( () ) + SAL_THROW(()) : rCont( rCont_ ) { MutexGuard aGuard( rCont.rMutex ); @@ -102,7 +102,7 @@ OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & nRemain = 0; } -OInterfaceIteratorHelper::~OInterfaceIteratorHelper() SAL_THROW( () ) +OInterfaceIteratorHelper::~OInterfaceIteratorHelper() SAL_THROW(()) { sal_Bool bShared; { @@ -127,7 +127,7 @@ OInterfaceIteratorHelper::~OInterfaceIteratorHelper() SAL_THROW( () ) } } -XInterface * OInterfaceIteratorHelper::next() SAL_THROW( () ) +XInterface * OInterfaceIteratorHelper::next() SAL_THROW(()) { if( nRemain ) { @@ -142,7 +142,7 @@ XInterface * OInterfaceIteratorHelper::next() SAL_THROW( () ) return 0; } -void OInterfaceIteratorHelper::remove() SAL_THROW( () ) +void OInterfaceIteratorHelper::remove() SAL_THROW(()) { if( bIsList ) { @@ -158,14 +158,14 @@ void OInterfaceIteratorHelper::remove() SAL_THROW( () ) } } -OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ ) SAL_THROW( () ) +OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ ) SAL_THROW(()) : rMutex( rMutex_ ) , bInUse( sal_False ) , bIsList( sal_False ) { } -OInterfaceContainerHelper::~OInterfaceContainerHelper() SAL_THROW( () ) +OInterfaceContainerHelper::~OInterfaceContainerHelper() SAL_THROW(()) { OSL_ENSURE( !bInUse, "~OInterfaceContainerHelper but is in use" ); if( bIsList ) @@ -174,7 +174,7 @@ OInterfaceContainerHelper::~OInterfaceContainerHelper() SAL_THROW( () ) aData.pAsInterface->release(); } -sal_Int32 OInterfaceContainerHelper::getLength() const SAL_THROW( () ) +sal_Int32 OInterfaceContainerHelper::getLength() const SAL_THROW(()) { MutexGuard aGuard( rMutex ); if( bIsList ) @@ -184,7 +184,7 @@ sal_Int32 OInterfaceContainerHelper::getLength() const SAL_THROW( () ) return 0; } -Sequence< Reference<XInterface> > OInterfaceContainerHelper::getElements() const SAL_THROW( () ) +Sequence< Reference<XInterface> > OInterfaceContainerHelper::getElements() const SAL_THROW(()) { MutexGuard aGuard( rMutex ); if( bIsList ) @@ -197,7 +197,7 @@ Sequence< Reference<XInterface> > OInterfaceContainerHelper::getElements() const return Sequence< Reference< XInterface > >(); } -void OInterfaceContainerHelper::copyAndResetInUse() SAL_THROW( () ) +void OInterfaceContainerHelper::copyAndResetInUse() SAL_THROW(()) { OSL_ENSURE( bInUse, "OInterfaceContainerHelper not in use" ); if( bInUse ) @@ -213,7 +213,7 @@ void OInterfaceContainerHelper::copyAndResetInUse() SAL_THROW( () ) } } -sal_Int32 OInterfaceContainerHelper::addInterface( const Reference<XInterface> & rListener ) SAL_THROW( () ) +sal_Int32 OInterfaceContainerHelper::addInterface( const Reference<XInterface> & rListener ) SAL_THROW(()) { OSL_ASSERT( rListener.is() ); MutexGuard aGuard( rMutex ); @@ -247,7 +247,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 ) SAL_THROW(()) { OSL_ASSERT( rListener.is() ); MutexGuard aGuard( rMutex ); @@ -303,7 +303,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 ) SAL_THROW(()) { ClearableMutexGuard aGuard( rMutex ); OInterfaceIteratorHelper aIt( *this ); @@ -333,7 +333,7 @@ void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) SAL_ } -void OInterfaceContainerHelper::clear() SAL_THROW( () ) +void OInterfaceContainerHelper::clear() SAL_THROW(()) { ClearableMutexGuard aGuard( rMutex ); OInterfaceIteratorHelper aIt( *this ); @@ -354,13 +354,13 @@ void OInterfaceContainerHelper::clear() SAL_THROW( () ) typedef ::std::vector< std::pair < Type , void* > > t_type2ptr; OMultiTypeInterfaceContainerHelper::OMultiTypeInterfaceContainerHelper( Mutex & rMutex_ ) - SAL_THROW( () ) + SAL_THROW(()) : rMutex( rMutex_ ) { m_pMap = new t_type2ptr(); } OMultiTypeInterfaceContainerHelper::~OMultiTypeInterfaceContainerHelper() - SAL_THROW( () ) + SAL_THROW(()) { t_type2ptr * pMap = (t_type2ptr *)m_pMap; t_type2ptr::iterator iter = pMap->begin(); @@ -375,7 +375,7 @@ OMultiTypeInterfaceContainerHelper::~OMultiTypeInterfaceContainerHelper() delete pMap; } Sequence< Type > OMultiTypeInterfaceContainerHelper::getContainedTypes() const - SAL_THROW( () ) + SAL_THROW(()) { t_type2ptr * pMap = (t_type2ptr *)m_pMap; t_type2ptr::size_type nSize; @@ -423,7 +423,7 @@ static t_type2ptr::iterator findType(t_type2ptr *pMap, const Type & rKey ) } OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelper::getContainer( const Type & rKey ) const - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); @@ -435,7 +435,7 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelper::getContainer( co } sal_Int32 OMultiTypeInterfaceContainerHelper::addInterface( const Type & rKey, const Reference< XInterface > & rListener ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); t_type2ptr * pMap = (t_type2ptr *)m_pMap; @@ -451,7 +451,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelper::addInterface( } sal_Int32 OMultiTypeInterfaceContainerHelper::removeInterface( const Type & rKey, const Reference< XInterface > & rListener ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); @@ -466,7 +466,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelper::removeInterface( return 0; } void OMultiTypeInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) - SAL_THROW( () ) + SAL_THROW(()) { t_type2ptr::size_type nSize = 0; OInterfaceContainerHelper ** ppListenerContainers = NULL; @@ -503,7 +503,7 @@ void OMultiTypeInterfaceContainerHelper::disposeAndClear( const EventObject & rE delete [] ppListenerContainers; } void OMultiTypeInterfaceContainerHelper::clear() - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); t_type2ptr * pMap = (t_type2ptr *)m_pMap; @@ -536,14 +536,14 @@ static t_long2ptr::iterator findLong(t_long2ptr *pMap, sal_Int32 nKey ) } OMultiTypeInterfaceContainerHelperInt32::OMultiTypeInterfaceContainerHelperInt32( Mutex & rMutex_ ) - SAL_THROW( () ) + SAL_THROW(()) : m_pMap( NULL ) , rMutex( rMutex_ ) { // delay pMap allocation until necessary. } OMultiTypeInterfaceContainerHelperInt32::~OMultiTypeInterfaceContainerHelperInt32() - SAL_THROW( () ) + SAL_THROW(()) { if (!m_pMap) return; @@ -561,7 +561,7 @@ OMultiTypeInterfaceContainerHelperInt32::~OMultiTypeInterfaceContainerHelperInt3 delete pMap; } Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes() const - SAL_THROW( () ) + SAL_THROW(()) { t_long2ptr * pMap = (t_long2ptr *)m_pMap; t_long2ptr::size_type nSize; @@ -594,7 +594,7 @@ Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes return ::com::sun::star::uno::Sequence< sal_Int32 >(); } OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperInt32::getContainer( const sal_Int32 & rKey ) const - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); @@ -608,7 +608,7 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperInt32::getContaine } sal_Int32 OMultiTypeInterfaceContainerHelperInt32::addInterface( const sal_Int32 & rKey, const Reference< XInterface > & rListener ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); if (!m_pMap) @@ -626,7 +626,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelperInt32::addInterface( } sal_Int32 OMultiTypeInterfaceContainerHelperInt32::removeInterface( const sal_Int32 & rKey, const Reference< XInterface > & rListener ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); @@ -643,7 +643,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelperInt32::removeInterface( return 0; } void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject & rEvt ) - SAL_THROW( () ) + SAL_THROW(()) { t_long2ptr::size_type nSize = 0; OInterfaceContainerHelper ** ppListenerContainers = NULL; @@ -682,7 +682,7 @@ void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject delete [] ppListenerContainers; } void OMultiTypeInterfaceContainerHelperInt32::clear() - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); if (!m_pMap) diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 431e24c76c01..eab09c55ab16 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star::uno; namespace cppu { //---- private forward ----------------------------------------------------------------------------- -Bootstrap const & get_unorc() SAL_THROW( () ); +Bootstrap const & get_unorc() SAL_THROW(()); } namespace cppuhelper { namespace detail { @@ -111,11 +111,11 @@ protected: virtual void SAL_CALL disposing(); public: - inline Bootstrap_MacroExpander() SAL_THROW( () ) + inline Bootstrap_MacroExpander() SAL_THROW(()) : t_uno_impl( m_mutex ) {} virtual ~Bootstrap_MacroExpander() - SAL_THROW( () ); + SAL_THROW(()); // XMacroExpander impl virtual OUString SAL_CALL expandMacros( OUString const & exp ) @@ -133,7 +133,7 @@ public: void Bootstrap_MacroExpander::disposing() {} //__________________________________________________________________________________________________ -Bootstrap_MacroExpander::~Bootstrap_MacroExpander() SAL_THROW( () ) +Bootstrap_MacroExpander::~Bootstrap_MacroExpander() SAL_THROW(()) {} // XServiceInfo impl @@ -185,7 +185,7 @@ namespace cppu { //################################################################################################## -Reference< lang::XSingleComponentFactory > create_boostrap_macro_expander_factory() SAL_THROW( () ) +Reference< lang::XSingleComponentFactory > create_boostrap_macro_expander_factory() SAL_THROW(()) { Reference< lang::XSingleComponentFactory > free(::cppu::createSingleComponentFactory( service_create, diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 338d9c184b24..a66f185c303a 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -51,15 +51,15 @@ IPropertyArrayHelper::~IPropertyArrayHelper() { } -inline const ::com::sun::star::uno::Type & getPropertyTypeIdentifier( ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & getPropertyTypeIdentifier( ) SAL_THROW(()) { return ::getCppuType( (Reference< XPropertyChangeListener > *)0 ); } -inline const ::com::sun::star::uno::Type & getPropertiesTypeIdentifier() SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & getPropertiesTypeIdentifier() SAL_THROW(()) { return ::getCppuType( (Reference< XPropertiesChangeListener > *)0 ); } -inline const ::com::sun::star::uno::Type & getVetoableTypeIdentifier() SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & getVetoableTypeIdentifier() SAL_THROW(()) { return ::getCppuType( (Reference< XVetoableChangeListener > *)0 ); } @@ -84,7 +84,7 @@ class OPropertySetHelperInfo_Impl Sequence < Property > aInfos; public: - OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW( () ); + OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW(()); // XPropertySetInfo-Methoden virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException); @@ -98,7 +98,7 @@ public: */ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) - SAL_THROW( () ) + SAL_THROW(()) :aInfos( rHelper_.getProperties() ) { } @@ -169,7 +169,7 @@ public: // class PropertySetHelper // ---------------------------------------------------- OPropertySetHelper::OPropertySetHelper( - OBroadcastHelper & rBHelper_ ) SAL_THROW( () ) + OBroadcastHelper & rBHelper_ ) SAL_THROW(()) : rBHelper( rBHelper_ ), aBoundLC( rBHelper_.rMutex ), aVetoableLC( rBHelper_.rMutex ), @@ -208,10 +208,10 @@ OPropertySetHelper2::OPropertySetHelper2( /** * You must call disposing before. */ -OPropertySetHelper::~OPropertySetHelper() SAL_THROW( () ) +OPropertySetHelper::~OPropertySetHelper() SAL_THROW(()) { } -OPropertySetHelper2::~OPropertySetHelper2() SAL_THROW( () ) +OPropertySetHelper2::~OPropertySetHelper2() SAL_THROW(()) { } @@ -251,7 +251,7 @@ Any OPropertySetHelper2::queryInterface( const ::com::sun::star::uno::Type & rTy } // ComponentHelper -void OPropertySetHelper::disposing() SAL_THROW( () ) +void OPropertySetHelper::disposing() SAL_THROW(()) { // Create an event with this as sender Reference < XPropertySet > rSource( SAL_STATIC_CAST( XPropertySet * , this ) , UNO_QUERY ); @@ -265,7 +265,7 @@ void OPropertySetHelper::disposing() SAL_THROW( () ) } Reference < XPropertySetInfo > OPropertySetHelper::createPropertySetInfo( - IPropertyArrayHelper & rProperties ) SAL_THROW( () ) + IPropertyArrayHelper & rProperties ) SAL_THROW(()) { return static_cast< XPropertySetInfo * >( new OPropertySetHelperInfo_Impl( rProperties ) ); } @@ -1126,7 +1126,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_THROW(()) { sal_Int32 i, nElements = aInfos.getLength(); const Property* pProperties = aInfos.getConstArray(); @@ -1157,7 +1157,7 @@ OPropertyArrayHelper::OPropertyArrayHelper( Property * pProps, sal_Int32 nEle, sal_Bool bSorted ) - SAL_THROW( () ) + SAL_THROW(()) : aInfos(pProps, nEle) , bRightOrdered( sal_False ) { @@ -1167,7 +1167,7 @@ OPropertyArrayHelper::OPropertyArrayHelper( OPropertyArrayHelper::OPropertyArrayHelper( const Sequence< Property > & aProps, sal_Bool bSorted ) - SAL_THROW( () ) + SAL_THROW(()) : aInfos(aProps) , bRightOrdered( sal_False ) { diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx index d0dea93cf664..ff4f41769b56 100644 --- a/cppuhelper/source/servicefactory.cxx +++ b/cppuhelper/source/servicefactory.cxx @@ -71,10 +71,10 @@ namespace cppu { Reference< security::XAccessController > -createDefaultAccessController() SAL_THROW( () ); +createDefaultAccessController() SAL_THROW(()); Reference< lang::XSingleComponentFactory > -create_boostrap_macro_expander_factory() SAL_THROW( () ); +create_boostrap_macro_expander_factory() SAL_THROW(()); OUString const & get_this_libpath(); @@ -105,7 +105,7 @@ static Reference< XInterface > SAL_CALL createInstance( Reference< registry::XSimpleRegistry > SAL_CALL createSimpleRegistry( OUString const & rBootstrapPath ) - SAL_THROW( () ) + SAL_THROW(()) { try { @@ -136,7 +136,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createSimpleRegistry( Reference< registry::XSimpleRegistry > SAL_CALL createNestedRegistry( OUString const & rBootstrapPath ) - SAL_THROW( () ) + SAL_THROW(()) { try { diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 48596aa40a2d..068a50a27247 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -59,7 +59,7 @@ namespace cppu #if OSL_DEBUG_LEVEL > 1 //------------------------------------------------------------------------------ -static inline void out( const char * p ) SAL_THROW( () ) +static inline void out( const char * p ) SAL_THROW(()) { printf( "%s\n", p ); } @@ -128,7 +128,7 @@ namespace } //------------------------------------------------------------------------------ -static const ::std::vector< OUString > * getAccessDPath() SAL_THROW( () ) +static const ::std::vector< OUString > * getAccessDPath() SAL_THROW(()) { return theAccessDPath::get().getAccessDPath(); } @@ -206,7 +206,7 @@ static bool checkAccessPath( OUString * pComp ) throw () //------------------------------------------------------------------------------ static inline sal_Int32 endsWith( - const OUString & rText, const OUString & rEnd ) SAL_THROW( () ) + const OUString & rText, const OUString & rEnd ) SAL_THROW(()) { if (rText.getLength() >= rEnd.getLength() && rEnd.equalsIgnoreAsciiCase( diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index a63f59bedf01..8217d8eecd58 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -732,7 +732,7 @@ class EventListenerImpl public: inline EventListenerImpl( Reference< container::XHierarchicalNameAccess > const & xTDMgr ) - SAL_THROW( () ) + SAL_THROW(()) : m_xTDMgr( xTDMgr ) {} @@ -754,7 +754,7 @@ void EventListenerImpl::disposing( lang::EventObject const & rEvt ) //================================================================================================== sal_Bool SAL_CALL installTypeDescriptionManager( Reference< container::XHierarchicalNameAccess > const & xTDMgr_c ) - SAL_THROW( () ) + SAL_THROW(()) { uno::Environment curr_env(Environment::getCurrent()); uno::Environment target_env(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))); diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx index 3f224f0a89c7..4887669128c7 100644 --- a/cppuhelper/source/typeprovider.cxx +++ b/cppuhelper/source/typeprovider.cxx @@ -37,12 +37,12 @@ namespace cppu { //__________________________________________________________________________________________________ -OImplementationId::~OImplementationId() SAL_THROW( () ) +OImplementationId::~OImplementationId() SAL_THROW(()) { delete _pSeq; } //__________________________________________________________________________________________________ -Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW( () ) +Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW(()) { if (! _pSeq) { @@ -59,7 +59,7 @@ Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW( ( //-------------------------------------------------------------------------------------------------- static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSource, sal_Int32 nOffset ) - SAL_THROW( () ) + SAL_THROW(()) { Type * pDest = rDest.getArray(); const Type * pSource = rSource.getConstArray(); @@ -72,7 +72,7 @@ static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSou OTypeCollection::OTypeCollection( const Type & rType1, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 1 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -83,7 +83,7 @@ OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 2 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -96,7 +96,7 @@ OTypeCollection::OTypeCollection( const Type & rType2, const Type & rType3, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 3 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -111,7 +111,7 @@ OTypeCollection::OTypeCollection( const Type & rType3, const Type & rType4, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 4 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -128,7 +128,7 @@ OTypeCollection::OTypeCollection( const Type & rType4, const Type & rType5, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 5 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -147,7 +147,7 @@ OTypeCollection::OTypeCollection( const Type & rType5, const Type & rType6, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 6 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -168,7 +168,7 @@ OTypeCollection::OTypeCollection( const Type & rType6, const Type & rType7, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 7 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -191,7 +191,7 @@ OTypeCollection::OTypeCollection( const Type & rType7, const Type & rType8, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 8 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -216,7 +216,7 @@ OTypeCollection::OTypeCollection( const Type & rType8, const Type & rType9, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 9 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -243,7 +243,7 @@ OTypeCollection::OTypeCollection( const Type & rType9, const Type & rType10, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 10 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -272,7 +272,7 @@ OTypeCollection::OTypeCollection( const Type & rType10, const Type & rType11, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 11 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -303,7 +303,7 @@ OTypeCollection::OTypeCollection( const Type & rType11, const Type & rType12, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 12 + rAddTypes.getLength() ) { _aTypes[0] = rType1; diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index 2e7e1832ba3c..b40cb444388d 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -39,7 +39,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() SAL_THROW(()) { static Mutex * s_pMutex = 0; if (! s_pMutex) @@ -56,7 +56,7 @@ public: /** Hold the weak object without an acquire (only the pointer). */ - OWeakConnectionPoint( OWeakObject* pObj ) SAL_THROW( () ) + OWeakConnectionPoint( OWeakObject* pObj ) SAL_THROW(()) : m_aRefCount( 0 ) , m_pObject(pObj) , m_aReferences( getWeakMutex() ) @@ -181,7 +181,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() SAL_THROW(()) : m_refCount( 0 ), m_pWeakConnectionPoint( 0 ) { @@ -328,9 +328,9 @@ namespace uno class OWeakRefListener : public XReference { public: - OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () ); - OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW( () ); - virtual ~OWeakRefListener() SAL_THROW( () ); + OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW(()); + OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW(()); + virtual ~OWeakRefListener() SAL_THROW(()); // XInterface Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException); @@ -346,10 +346,10 @@ public: Reference< XAdapter > m_XWeakConnectionPoint; private: - OWeakRefListener& SAL_CALL operator=(const OWeakRefListener& rRef) SAL_THROW( () ); + OWeakRefListener& SAL_CALL operator=(const OWeakRefListener& rRef) SAL_THROW(()); }; -OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () ) +OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW(()) : com::sun::star::uno::XReference() , m_aRefCount( 1 ) { @@ -366,7 +366,7 @@ OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () ) osl_decrementInterlockedCount( &m_aRefCount ); } -OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW( () ) +OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW(()) : m_aRefCount( 1 ) { try @@ -387,7 +387,7 @@ OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THRO osl_decrementInterlockedCount( &m_aRefCount ); } -OWeakRefListener::~OWeakRefListener() SAL_THROW( () ) +OWeakRefListener::~OWeakRefListener() SAL_THROW(()) { try { @@ -440,7 +440,7 @@ void SAL_CALL OWeakRefListener::dispose() //------------------------------------------------------------------------ //-- WeakReferenceHelper ---------------------------------------------------------- //------------------------------------------------------------------------ -WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SAL_THROW( () ) +WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SAL_THROW(()) : m_pImpl( 0 ) { if (xInt.is()) @@ -450,7 +450,7 @@ WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SA } } -WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SAL_THROW( () ) +WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SAL_THROW(()) : m_pImpl( 0 ) { Reference< XInterface > xInt( rWeakRef.get() ); @@ -461,7 +461,7 @@ WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SA } } -void WeakReferenceHelper::clear() SAL_THROW( () ) +void WeakReferenceHelper::clear() SAL_THROW(()) { try { @@ -480,7 +480,7 @@ void WeakReferenceHelper::clear() SAL_THROW( () ) catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected() } -WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) SAL_THROW( () ) +WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) SAL_THROW(()) { if (this == &rWeakRef) { @@ -492,7 +492,7 @@ WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& r WeakReferenceHelper & SAL_CALL WeakReferenceHelper::operator= (const Reference< XInterface > & xInt) -SAL_THROW( () ) +SAL_THROW(()) { try { @@ -507,12 +507,12 @@ SAL_THROW( () ) return *this; } -WeakReferenceHelper::~WeakReferenceHelper() SAL_THROW( () ) +WeakReferenceHelper::~WeakReferenceHelper() SAL_THROW(()) { clear(); } -Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () ) +Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW(()) { try { diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index 4e30393054f3..2dd1d57b47da 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -90,7 +90,7 @@ class ServiceImpl0 Reference< XComponentContext > m_xContext; public: - ServiceImpl0( Reference< XComponentContext > const & xContext ) SAL_THROW( () ); + ServiceImpl0( Reference< XComponentContext > const & xContext ) SAL_THROW(()); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& rArgs ) throw (Exception, RuntimeException); @@ -101,7 +101,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 ) SAL_THROW(()) : m_xContext( xContext ) { sal_Int32 n; @@ -168,7 +168,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 ) SAL_THROW(()) : ServiceImpl0( xContext ) {} diff --git a/cpputools/source/regsingleton/regsingleton.cxx b/cpputools/source/regsingleton/regsingleton.cxx index da6258f106a9..3e3831c42f3a 100644 --- a/cpputools/source/regsingleton/regsingleton.cxx +++ b/cpputools/source/regsingleton/regsingleton.cxx @@ -43,7 +43,7 @@ using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -static void print_options() SAL_THROW( () ) +static void print_options() SAL_THROW(()) { printf( "\nusage: regsingleton [-r|-ra] registry_file singleton_name[=service_name] ...\n\n" diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index e126d15b2f27..1ac73ac62ead 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -241,7 +241,7 @@ namespace migration Reference< XInterface > SAL_CALL BasicMigration_create( Reference< XComponentContext > const & ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new BasicMigration() ); } diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index e1b4f2d5a33e..563ed1489d8a 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -549,7 +549,7 @@ void TmpRepositoryCommandEnv::pop() throw (uno::RuntimeException) Reference< XInterface > SAL_CALL OO3ExtensionMigration_create( Reference< XComponentContext > const & ctx ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new OO3ExtensionMigration( ctx) ); diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 7871af1cb170..3a30754f1f0a 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -309,7 +309,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) Reference< XInterface > SAL_CALL WordbookMigration_create( Reference< XComponentContext > const & ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new WordbookMigration() ); } diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx index 0faa0219a495..b084ac263dd0 100644 --- a/extensions/test/stm/datatest.cxx +++ b/extensions/test/stm/datatest.cxx @@ -337,7 +337,7 @@ XInterfaceRef ODataStreamTest_CreateInstance( const XMultiServiceFactoryRef & rS return xService; } -Sequence<UString> ODataStreamTest_getSupportedServiceNames( int i) THROWS( () ) +Sequence<UString> ODataStreamTest_getSupportedServiceNames( int i) THROWS(()) { Sequence<UString> aRet(1); @@ -347,7 +347,7 @@ Sequence<UString> ODataStreamTest_getSupportedServiceNames( int i) THROWS( () ) return aRet; } -UString ODataStreamTest_getServiceName( int i) THROWS( () ) +UString ODataStreamTest_getServiceName( int i) THROWS(()) { if( 1 == i ) { return L"test.com.sun.star.io.DataInputStream"; @@ -357,7 +357,7 @@ UString ODataStreamTest_getServiceName( int i) THROWS( () ) } } -UString ODataStreamTest_getImplementationName( int i) THROWS( () ) +UString ODataStreamTest_getImplementationName( int i) THROWS(()) { if( 1 == i ) { return L"test.com.sun.star.comp.extensions.stm.DataInputStream"; @@ -622,19 +622,19 @@ XInterfaceRef OMyPersistObject_CreateInstance( const XMultiServiceFactoryRef & r return xService; } -Sequence<UString> OMyPersistObject_getSupportedServiceNames( ) THROWS( () ) +Sequence<UString> OMyPersistObject_getSupportedServiceNames( ) THROWS(()) { Sequence<UString> aRet(1); aRet.getArray()[0] = OMyPersistObject_getImplementationName(); return aRet; } -UString OMyPersistObject_getServiceName( ) THROWS( () ) +UString OMyPersistObject_getServiceName( ) THROWS(()) { return L"test.com.sun.star.io.PersistTest"; } -UString OMyPersistObject_getImplementationName( ) THROWS( () ) +UString OMyPersistObject_getImplementationName( ) THROWS(()) { return L"test.com.sun.star.io.PersistTest"; } @@ -1038,14 +1038,14 @@ XInterfaceRef OObjectStreamTest_CreateInstance( const XMultiServiceFactoryRef & return xService; } -Sequence<UString> OObjectStreamTest_getSupportedServiceNames( int i) THROWS( () ) +Sequence<UString> OObjectStreamTest_getSupportedServiceNames( int i) THROWS(()) { Sequence<UString> aRet(1); aRet.getArray()[0] = OObjectStreamTest_getImplementationName( i); return aRet; } -UString OObjectStreamTest_getServiceName( int i) THROWS( () ) +UString OObjectStreamTest_getServiceName( int i) THROWS(()) { if( 1 == i ) { return L"test.com.sun.star.io.ObjectInputStream"; @@ -1055,7 +1055,7 @@ UString OObjectStreamTest_getServiceName( int i) THROWS( () ) } } -UString OObjectStreamTest_getImplementationName( int i) THROWS( () ) +UString OObjectStreamTest_getImplementationName( int i) THROWS(()) { if( 1 == i ) { return L"test.com.sun.star.comp.extensions.stm.ObjectInputStream"; diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx index d5c2c9b6a94c..e27f9aa2b4c7 100644 --- a/extensions/test/stm/marktest.cxx +++ b/extensions/test/stm/marktest.cxx @@ -66,8 +66,8 @@ public: // refcounting void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } public: // implementation names - static Sequence< UString > getSupportedServiceNames_Static(void) THROWS( () ); - static UString getImplementationName_Static() THROWS( () ); + static Sequence< UString > getSupportedServiceNames_Static(void) THROWS(()); + static UString getImplementationName_Static() THROWS(()); public: virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject) @@ -374,7 +374,7 @@ XInterfaceRef OMarkableOutputStreamTest_CreateInstance( const XMultiServiceFacto -Sequence<UString> OMarkableOutputStreamTest_getSupportedServiceNames(void) THROWS( () ) +Sequence<UString> OMarkableOutputStreamTest_getSupportedServiceNames(void) THROWS(()) { Sequence<UString> aRet(1); aRet.getArray()[0] = OMarkableOutputStreamTest_getImplementationName(); @@ -382,12 +382,12 @@ Sequence<UString> OMarkableOutputStreamTest_getSupportedServiceNames(void) THROW return aRet; } -UString OMarkableOutputStreamTest_getServiceName() THROWS( () ) +UString OMarkableOutputStreamTest_getServiceName() THROWS(()) { return L"test.com.sun.star.io.MarkableOutputStream"; } -UString OMarkableOutputStreamTest_getImplementationName() THROWS( () ) +UString OMarkableOutputStreamTest_getImplementationName() THROWS(()) { return L"test.com.sun.starextensions.stm.MarkableOutputStream"; } @@ -416,8 +416,8 @@ public: // refcounting void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } public: // implementation names - static Sequence< UString > getSupportedServiceNames_Static(void) THROWS( () ); - static UString getImplementationName_Static() THROWS( () ); + static Sequence< UString > getSupportedServiceNames_Static(void) THROWS(()); + static UString getImplementationName_Static() THROWS(()); public: virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject) @@ -635,7 +635,7 @@ XInterfaceRef OMarkableInputStreamTest_CreateInstance( const XMultiServiceFactor -Sequence<UString> OMarkableInputStreamTest_getSupportedServiceNames(void) THROWS( () ) +Sequence<UString> OMarkableInputStreamTest_getSupportedServiceNames(void) THROWS(()) { Sequence<UString> aRet(1); aRet.getArray()[0] = OMarkableInputStreamTest_getImplementationName(); @@ -643,12 +643,12 @@ Sequence<UString> OMarkableInputStreamTest_getSupportedServiceNames(void) THROWS return aRet; } -UString OMarkableInputStreamTest_getServiceName() THROWS( () ) +UString OMarkableInputStreamTest_getServiceName() THROWS(()) { return L"test.com.sun.star.io.MarkableInputStream"; } -UString OMarkableInputStreamTest_getImplementationName() THROWS( () ) +UString OMarkableInputStreamTest_getImplementationName() THROWS(()) { return L"test.com.sun.star.extensions.stm.MarkableInputStream"; } diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx index bbf7caec0bc8..b888b066f065 100644 --- a/extensions/test/stm/pipetest.cxx +++ b/extensions/test/stm/pipetest.cxx @@ -106,8 +106,8 @@ public: // refcounting void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } public: // implementation names - static Sequence< UString > getSupportedServiceNames_Static(void) THROWS( () ); - static UString getImplementationName_Static() THROWS( () ); + static Sequence< UString > getSupportedServiceNames_Static(void) THROWS(()); + static UString getImplementationName_Static() THROWS(()); public: virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject) @@ -425,7 +425,7 @@ XInterfaceRef OPipeTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) -Sequence<UString> OPipeTest_getSupportedServiceNames(void) THROWS( () ) +Sequence<UString> OPipeTest_getSupportedServiceNames(void) THROWS(()) { Sequence<UString> aRet(1); aRet.getArray()[0] = OPipeTest_getImplementationName(); @@ -433,12 +433,12 @@ Sequence<UString> OPipeTest_getSupportedServiceNames(void) THROWS( () ) return aRet; } -UString OPipeTest_getServiceName() THROWS( () ) +UString OPipeTest_getServiceName() THROWS(()) { return SERVICE_NAME; } -UString OPipeTest_getImplementationName() THROWS( () ) +UString OPipeTest_getImplementationName() THROWS(()) { return IMPLEMENTATION_NAME; } diff --git a/extensions/test/stm/testfactreg.hxx b/extensions/test/stm/testfactreg.hxx index 81c22d00b351..590bfad72be0 100644 --- a/extensions/test/stm/testfactreg.hxx +++ b/extensions/test/stm/testfactreg.hxx @@ -26,34 +26,34 @@ * ************************************************************************/ XInterfaceRef OPipeTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception)); -Sequence<UString> OPipeTest_getSupportedServiceNames(void) THROWS( () ); -UString OPipeTest_getServiceName() THROWS( () ); -UString OPipeTest_getImplementationName() THROWS( () ); +Sequence<UString> OPipeTest_getSupportedServiceNames(void) THROWS(()); +UString OPipeTest_getServiceName() THROWS(()); +UString OPipeTest_getImplementationName() THROWS(()); XInterfaceRef ODataStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception)); -Sequence<UString> ODataStreamTest_getSupportedServiceNames( int i) THROWS( () ); +Sequence<UString> ODataStreamTest_getSupportedServiceNames( int i) THROWS(()); UString ODataStreamTest_getServiceName( int i) THROWS( ( ) ); -UString ODataStreamTest_getImplementationName( int i) THROWS( () ); +UString ODataStreamTest_getImplementationName( int i) THROWS(()); XInterfaceRef OMarkableOutputStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception)); -Sequence<UString> OMarkableOutputStreamTest_getSupportedServiceNames(void) THROWS( () ); -UString OMarkableOutputStreamTest_getServiceName() THROWS( () ); -UString OMarkableOutputStreamTest_getImplementationName() THROWS( () ); +Sequence<UString> OMarkableOutputStreamTest_getSupportedServiceNames(void) THROWS(()); +UString OMarkableOutputStreamTest_getServiceName() THROWS(()); +UString OMarkableOutputStreamTest_getImplementationName() THROWS(()); XInterfaceRef OMarkableInputStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception)); -Sequence<UString> OMarkableInputStreamTest_getSupportedServiceNames(void) THROWS( () ); -UString OMarkableInputStreamTest_getServiceName() THROWS( () ); -UString OMarkableInputStreamTest_getImplementationName() THROWS( () ); +Sequence<UString> OMarkableInputStreamTest_getSupportedServiceNames(void) THROWS(()); +UString OMarkableInputStreamTest_getServiceName() THROWS(()); +UString OMarkableInputStreamTest_getImplementationName() THROWS(()); XInterfaceRef OObjectStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception)); -Sequence<UString> OObjectStreamTest_getSupportedServiceNames( int i) THROWS( () ); -UString OObjectStreamTest_getServiceName( int i) THROWS( () ); -UString OObjectStreamTest_getImplementationName( int i) THROWS( () ); +Sequence<UString> OObjectStreamTest_getSupportedServiceNames( int i) THROWS(()); +UString OObjectStreamTest_getServiceName( int i) THROWS(()); +UString OObjectStreamTest_getImplementationName( int i) THROWS(()); XInterfaceRef OMyPersistObject_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception)); -Sequence<UString> OMyPersistObject_getSupportedServiceNames( ) THROWS( () ); -UString OMyPersistObject_getServiceName( ) THROWS( () ); -UString OMyPersistObject_getImplementationName( ) THROWS( () ); +Sequence<UString> OMyPersistObject_getSupportedServiceNames( ) THROWS(()); +UString OMyPersistObject_getServiceName( ) THROWS(()); +UString OMyPersistObject_getImplementationName( ) THROWS(()); Sequence<BYTE> createSeq( char * p ); Sequence<BYTE> createIntSeq( INT32 i ); diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index 6dc42f4ed322..94527830000d 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -124,7 +124,7 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::com::sun::star::lang::XType private: ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); - static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties ) SAL_THROW( () ); + static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties ) SAL_THROW(()); void copyItemContainer( const std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rSourceVector ); com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer ); diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index ab61954b90da..5f7cbed7ac73 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -56,7 +56,7 @@ namespace framework */ extern "C" { -static int SAL_CALL compare_OUString_Property_Impl( const void *arg1, const void *arg2 ) SAL_THROW( () ) +static int SAL_CALL compare_OUString_Property_Impl( const void *arg1, const void *arg2 ) SAL_THROW(()) { return ((::rtl::OUString *)arg1)->compareTo( ((Property *)arg2)->Name ); } @@ -68,7 +68,7 @@ class OPropertySetHelperInfo_Impl Sequence < Property > aInfos; public: - OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW( () ); + OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW(()); // XPropertySetInfo-Methoden virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException); @@ -82,7 +82,7 @@ public: */ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) - SAL_THROW( () ) + SAL_THROW(()) :aInfos( rHelper_.getProperties() ) { } @@ -442,7 +442,7 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > ConstItem } Reference < XPropertySetInfo > ConstItemContainer::createPropertySetInfo( - IPropertyArrayHelper & rProperties ) SAL_THROW( () ) + IPropertyArrayHelper & rProperties ) SAL_THROW(()) { return static_cast< XPropertySetInfo * >( new OPropertySetHelperInfo_Impl( rProperties ) ); } diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 6c33051f7675..9d398a05140c 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -81,7 +81,7 @@ DEFINE_INIT_SERVICE( void flatten_struct_members( ::std::vector< Any > * vec, void const * data, typelib_CompoundTypeDescription * pTD ) - SAL_THROW( () ) + SAL_THROW(()) { if (pTD->pBaseTypeDescription) { diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 21fcbe32f6a1..ecbf7ab4c29f 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -401,7 +401,7 @@ Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames_Static( ) */ Reference< XInterface > SAL_CALL LangGuess_Impl_create( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< ::cppu::OWeakObject * >( new LangGuess_Impl(xContext) ); } diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx index 5b973342bdf7..8080e5638515 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -244,14 +244,14 @@ Sequence< OUString > MyService1Impl::getSupportedServiceNames() Reference< XInterface > SAL_CALL create_MyService1Impl( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new MyService1Impl( xContext) ); } // forward decl: implemented in service2_impl.cxx Reference< XInterface > SAL_CALL create_MyService2Impl( - Reference< XComponentContext > const & ) SAL_THROW( () ); + Reference< XComponentContext > const & ) SAL_THROW(()); } diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx index ff3942d26f67..6d498dbe95df 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx @@ -55,7 +55,7 @@ extern Sequence< OUString > SAL_CALL getSupportedServiceNames_MyService1Impl(); extern OUString SAL_CALL getImplementationName_MyService1Impl(); extern Reference< XInterface > SAL_CALL create_MyService1Impl( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ); + SAL_THROW(()); static Sequence< OUString > getSupportedServiceNames_MyService2Impl() { @@ -170,7 +170,7 @@ Sequence< OUString > MyService2Impl::getSupportedServiceNames() Reference< XInterface > SAL_CALL create_MyService2Impl( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< ::cppu::OWeakObject * >( new MyService2Impl( xContext ) ); } diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx index 912f07bb64d7..ed2f76303453 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx @@ -79,13 +79,13 @@ namespace connectivity ,nSearchType( ::com::sun::star::sdbc::ColumnSearch::FULL) {} - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t nSize,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * pMem,void* _pHint ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem,void* _pHint ) SAL_THROW(()) { } sal_Bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index ce58f9914ddc..b7724c7d0992 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -79,7 +79,7 @@ void PyUNO_del (PyObject* self) -OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef , sal_Int32 mode ) SAL_THROW( () ) +OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef , sal_Int32 mode ) SAL_THROW(()) { OSL_ASSERT( pVal ); if (pTypeRef->eTypeClass == typelib_TypeClass_VOID) diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index a4af5c2b2c38..944b87985486 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -128,7 +128,7 @@ void logException( RuntimeCargo *cargo, const char *intro, const void * data, const com::sun::star::uno::Type & type ); static const sal_Int32 VAL2STR_MODE_DEEP = 0; static const sal_Int32 VAL2STR_MODE_SHALLOW = 1; -rtl::OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef, sal_Int32 mode = VAL2STR_MODE_DEEP ) SAL_THROW( () ); +rtl::OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef, sal_Int32 mode = VAL2STR_MODE_DEEP ) SAL_THROW(()); //-------------------------------------------------- typedef ::boost::unordered_map diff --git a/sal/inc/rtl/bootstrap.hxx b/sal/inc/rtl/bootstrap.hxx index 1fc594683dcb..60ad350435bf 100644 --- a/sal/inc/rtl/bootstrap.hxx +++ b/sal/inc/rtl/bootstrap.hxx @@ -80,7 +80,7 @@ namespace rtl @see rtl_bootstrap_set() */ static inline void set( ::rtl::OUString const & name, ::rtl::OUString const & value ) - SAL_THROW( () ); + SAL_THROW(()); /** default ctor. */ @@ -125,21 +125,21 @@ namespace rtl @param macro [inout] The macro to be expanded */ - inline void expandMacrosFrom( ::rtl::OUString & macro ) const SAL_THROW( () ) + inline void expandMacrosFrom( ::rtl::OUString & macro ) const SAL_THROW(()) { rtl_bootstrap_expandMacros_from_handle( _handle, ¯o.pData ); } /** Expands a macro using default bootstrap variables. @param macro [inout] The macro to be expanded */ - static inline void expandMacros( ::rtl::OUString & macro ) SAL_THROW( () ) + static inline void expandMacros( ::rtl::OUString & macro ) SAL_THROW(()) { rtl_bootstrap_expandMacros( ¯o.pData ); } /** Provides the bootstrap internal handle. @return bootstrap handle */ - inline rtlBootstrapHandle getHandle() const SAL_THROW( () ) + inline rtlBootstrapHandle getHandle() const SAL_THROW(()) { return _handle; } /** Escapes special characters ("$" and "\"). @@ -154,7 +154,7 @@ namespace rtl @since UDK 3.2.9 */ static inline ::rtl::OUString encode( ::rtl::OUString const & value ) - SAL_THROW( () ); + SAL_THROW(()); }; //---------------------------------------------------------------------------- @@ -179,7 +179,7 @@ namespace rtl } inline void Bootstrap::set( ::rtl::OUString const & name, ::rtl::OUString const & value ) - SAL_THROW( () ) + SAL_THROW(()) { rtl_bootstrap_set( name.pData, value.pData ); } @@ -223,7 +223,7 @@ namespace rtl } inline ::rtl::OUString Bootstrap::encode( ::rtl::OUString const & value ) - SAL_THROW( () ) + SAL_THROW(()) { ::rtl::OUString encoded; rtl_bootstrap_encode(value.pData, &encoded.pData); diff --git a/sal/inc/rtl/byteseq.h b/sal/inc/rtl/byteseq.h index 93e85ddcd500..8d52c7e49adc 100644 --- a/sal/inc/rtl/byteseq.h +++ b/sal/inc/rtl/byteseq.h @@ -172,29 +172,29 @@ class ByteSequence public: /// @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 ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(()) { ::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 ) SAL_THROW(()) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) + inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(()) {} /// @endcond /** Default constructor: Creates an empty sequence. */ - inline ByteSequence() SAL_THROW( () ); + inline ByteSequence() SAL_THROW(()); /** Copy constructor: Creates a copy of given sequence. @param rSeq another byte sequence */ - inline ByteSequence( const ByteSequence & rSeq ) SAL_THROW( () ); + inline ByteSequence( const ByteSequence & rSeq ) SAL_THROW(()); /** Copy constructor Creates a copy from the C-Handle. @param pSequence another byte sequence handle */ - inline ByteSequence( sal_Sequence *pSequence ) SAL_THROW( () ); + inline ByteSequence( sal_Sequence *pSequence ) SAL_THROW(()); /** Constructor: Creates a copy of given data bytes. @param pElements an array of bytes @@ -222,23 +222,23 @@ public: @param pSequence sequence handle to be taken over @param noacquire dummy parameter forcing explicit BYTESEQ_NOACQUIRE */ - inline ByteSequence( sal_Sequence *pSequence , enum __ByteSequence_NoAcquire noacquire ) SAL_THROW( () ); + inline ByteSequence( sal_Sequence *pSequence , enum __ByteSequence_NoAcquire noacquire ) SAL_THROW(()); /** Destructor: Releases sequence handle. Last handle will free memory. */ - inline ~ByteSequence() SAL_THROW( () ); + inline ~ByteSequence() SAL_THROW(()); /** Assignment operator: Acquires given sequence handle and releases a previously set handle. @param rSeq another byte sequence @return this sequence */ - inline ByteSequence & SAL_CALL operator = ( const ByteSequence & rSeq ) SAL_THROW( () ); + inline ByteSequence & SAL_CALL operator = ( const ByteSequence & rSeq ) SAL_THROW(()); /** Gets the length of sequence. @return length of sequence */ - inline sal_Int32 SAL_CALL getLength() const SAL_THROW( () ) + inline sal_Int32 SAL_CALL getLength() const SAL_THROW(()) { return _pSequence->nElements; } /** Gets a pointer to byte array for READING. If the sequence has a length of 0, then the @@ -246,7 +246,7 @@ public: @return pointer to byte array */ - inline const sal_Int8 * SAL_CALL getConstArray() const SAL_THROW( () ) + inline const sal_Int8 * SAL_CALL getConstArray() const SAL_THROW(()) { return (const sal_Int8 *)_pSequence->elements; } /** Gets a pointer to elements array for READING AND WRITING. In general if the sequence has a handle acquired by other sequences (reference count > 1), then a new sequence is @@ -277,7 +277,7 @@ public: @param nIndex index @return const C++ reference to byte at element of indenx nIndex */ - inline const sal_Int8 & SAL_CALL operator [] ( sal_Int32 nIndex ) const SAL_THROW( () ) + inline const sal_Int8 & SAL_CALL operator [] ( sal_Int32 nIndex ) const SAL_THROW(()) { return getConstArray()[ nIndex ]; } /** Equality operator: Compares two sequences. @@ -285,13 +285,13 @@ public: @param rSeq another byte sequence (right side) @return true if both sequences are equal, false otherwise */ - inline sal_Bool SAL_CALL operator == ( const ByteSequence & rSeq ) const SAL_THROW( () ); + inline sal_Bool SAL_CALL operator == ( const ByteSequence & rSeq ) const SAL_THROW(()); /** Unequality operator: Compares two sequences. @param rSeq another byte sequence (right side) @return false if both sequences are equal, true otherwise */ - inline sal_Bool SAL_CALL operator != ( const ByteSequence & rSeq ) const SAL_THROW( () ); + inline sal_Bool SAL_CALL operator != ( const ByteSequence & rSeq ) const SAL_THROW(()); /** Reallocates sequence to new length. If the sequence has a handle acquired by other sequences (reference count > 1), then the remaining elements are copied to a new sequence handle to @@ -305,13 +305,13 @@ public: @return UNacquired handle of the sequence */ - inline sal_Sequence * SAL_CALL getHandle() const SAL_THROW( () ) + inline sal_Sequence * SAL_CALL getHandle() const SAL_THROW(()) { return _pSequence; } /** Returns the UNnacquired C handle of the sequence (for compatibility reasons) @return UNacquired handle of the sequence */ - inline sal_Sequence * SAL_CALL get() const SAL_THROW( () ) + inline sal_Sequence * SAL_CALL get() const SAL_THROW(()) { return _pSequence; } }; diff --git a/sal/inc/rtl/byteseq.hxx b/sal/inc/rtl/byteseq.hxx index c0ccc13f7b94..852670e2a017 100644 --- a/sal/inc/rtl/byteseq.hxx +++ b/sal/inc/rtl/byteseq.hxx @@ -42,19 +42,19 @@ namespace rtl { //__________________________________________________________________________________________________ -inline ByteSequence::ByteSequence() SAL_THROW( () ) +inline ByteSequence::ByteSequence() SAL_THROW(()) : _pSequence( 0 ) { ::rtl_byte_sequence_construct( &_pSequence, 0 ); } //__________________________________________________________________________________________________ -inline ByteSequence::ByteSequence( const ByteSequence & rSeq ) SAL_THROW( () ) +inline ByteSequence::ByteSequence( const ByteSequence & rSeq ) SAL_THROW(()) : _pSequence( 0 ) { ::rtl_byte_sequence_assign( &_pSequence, rSeq._pSequence ); } //__________________________________________________________________________________________________ -inline ByteSequence::ByteSequence( sal_Sequence *pSequence) SAL_THROW( () ) +inline ByteSequence::ByteSequence( sal_Sequence *pSequence) SAL_THROW(()) : _pSequence( pSequence ) { ::rtl_byte_sequence_acquire( pSequence ); @@ -80,7 +80,7 @@ inline ByteSequence::ByteSequence( sal_Int32 len, enum __ByteSequence_NoDefault #endif } //__________________________________________________________________________________________________ -inline ByteSequence::ByteSequence( sal_Sequence *pSequence, enum __ByteSequence_NoAcquire ) SAL_THROW( () ) +inline ByteSequence::ByteSequence( sal_Sequence *pSequence, enum __ByteSequence_NoAcquire ) SAL_THROW(()) : _pSequence( pSequence ) { } @@ -95,18 +95,18 @@ inline ByteSequence::ByteSequence( sal_Int32 len ) #endif } //__________________________________________________________________________________________________ -inline ByteSequence::~ByteSequence() SAL_THROW( () ) +inline ByteSequence::~ByteSequence() SAL_THROW(()) { ::rtl_byte_sequence_release( _pSequence ); } //__________________________________________________________________________________________________ -inline ByteSequence & ByteSequence::operator = ( const ByteSequence & rSeq ) SAL_THROW( () ) +inline ByteSequence & ByteSequence::operator = ( const ByteSequence & rSeq ) SAL_THROW(()) { ::rtl_byte_sequence_assign( &_pSequence, rSeq._pSequence ); return *this; } //__________________________________________________________________________________________________ -inline sal_Bool ByteSequence::operator == ( const ByteSequence & rSeq ) const SAL_THROW( () ) +inline sal_Bool ByteSequence::operator == ( const ByteSequence & rSeq ) const SAL_THROW(()) { return ::rtl_byte_sequence_equals( _pSequence, rSeq._pSequence ); } @@ -135,7 +135,7 @@ inline sal_Int8 & ByteSequence::operator [] ( sal_Int32 nIndex ) return getArray()[ nIndex ]; } //__________________________________________________________________________________________________ -inline sal_Bool ByteSequence::operator != ( const ByteSequence & rSeq ) const SAL_THROW( () ) +inline sal_Bool ByteSequence::operator != ( const ByteSequence & rSeq ) const SAL_THROW(()) { return (! operator == ( rSeq )); } diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index f13f57cd6c20..ace4b1ae7179 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -128,7 +128,7 @@ public: @param str OUString data */ - inline OUString( rtl_uString * str, __sal_NoAcquire ) SAL_THROW( () ) + inline OUString( rtl_uString * str, __sal_NoAcquire ) SAL_THROW(()) { pData = str; } /** diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 6c613c060a50..f04c14cd0ff1 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -376,7 +376,7 @@ typedef struct _sal_Sequence use common C++ throw statement for throwing exceptions, e.g. throw RuntimeException(); - SAL_THROW() should be used for all C++ functions, e.g. SAL_THROW( () ) + SAL_THROW() should be used for all C++ functions, e.g. SAL_THROW(()) SAL_THROW_EXTERN_C() should be used for all C functions */ #ifdef __cplusplus diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index c2c0653b85d6..41b10751b397 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -565,7 +565,7 @@ namespace basprov static Reference< XInterface > SAL_CALL create_BasicProviderImpl( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new BasicProviderImpl( xContext ) ); } diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index d828e04c69a8..3a4ceef7a2ec 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -859,7 +859,7 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re static Reference< XInterface > SAL_CALL create_DialogProviderImpl( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new DialogProviderImpl( xContext ) ); } diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 19c534cacdbc..a1a646426bdc 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -732,7 +732,7 @@ BrowseNodeFactoryImpl::getOrganizerHierarchy() Sequence< ::rtl::OUString > SAL_CALL bnf_getSupportedServiceNames( ) - SAL_THROW( () ) + SAL_THROW(()) { ::rtl::OUString str_name(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.browse.BrowseNodeFactory")); @@ -742,7 +742,7 @@ bnf_getSupportedServiceNames( ) ::rtl::OUString SAL_CALL bnf_getImplementationName( ) - SAL_THROW( () ) + SAL_THROW(()) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.browse.BrowseNodeFactory" )); diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 81d647895811..54395d72ca13 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -885,7 +885,7 @@ Reference< XInterface > SAL_CALL sp_create( //************************************************************************* Sequence< ::rtl::OUString > sp_getSupportedServiceNames( ) - SAL_THROW( () ) + SAL_THROW(()) { ::rtl::OUString names[3]; @@ -901,7 +901,7 @@ Sequence< ::rtl::OUString > sp_getSupportedServiceNames( ) //************************************************************************* ::rtl::OUString sp_getImplementationName( ) -SAL_THROW( () ) +SAL_THROW(()) { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.script.provider.MasterScriptProvider" ) ); @@ -916,7 +916,7 @@ Reference< XInterface > SAL_CALL urihelper_create( } Sequence< ::rtl::OUString > urihelper_getSupportedServiceNames( ) - SAL_THROW( () ) + SAL_THROW(()) { ::rtl::OUString serviceNameList[] = { ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -929,7 +929,7 @@ Sequence< ::rtl::OUString > urihelper_getSupportedServiceNames( ) } ::rtl::OUString urihelper_getImplementationName( ) - SAL_THROW( () ) + SAL_THROW(()) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.provider.ScriptURIHelper")); diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx index 88125326761d..dd0b10c26ce3 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.cxx +++ b/scripting/source/provider/MasterScriptProviderFactory.cxx @@ -88,7 +88,7 @@ MasterScriptProviderFactory::getActiveMSPList() const Sequence< ::rtl::OUString > SAL_CALL mspf_getSupportedServiceNames( ) - SAL_THROW( () ) + SAL_THROW(()) { ::rtl::OUString str_name(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.provider.MasterScriptProviderFactory")); @@ -98,7 +98,7 @@ mspf_getSupportedServiceNames( ) ::rtl::OUString SAL_CALL mspf_getImplementationName( ) - SAL_THROW( () ) + SAL_THROW(()) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.provider.MasterScriptProviderFactory")); diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx index a9b0ed19a070..1ee7580680d9 100644 --- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx +++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx @@ -612,13 +612,13 @@ SAL_THROW( ( Exception ) ) } //************************************************************************* -Sequence< OUString > scriptnri_getSupportedServiceNames() SAL_THROW( () ) +Sequence< OUString > scriptnri_getSupportedServiceNames() SAL_THROW(()) { return nrs_serviceNames; } //************************************************************************* -OUString scriptnri_getImplementationName() SAL_THROW( () ) +OUString scriptnri_getImplementationName() SAL_THROW(()) { return nrs_implName; } diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx index 929cffc213aa..6452911b3ab7 100644 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx +++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx @@ -368,14 +368,14 @@ static Reference< XInterface > SAL_CALL srm_create( //************************************************************************* static Sequence<OUString> srm_getSupportedServiceNames( ) -SAL_THROW( () ) +SAL_THROW(()) { return s_serviceNames; } //************************************************************************* static OUString srm_getImplementationName( ) -SAL_THROW( () ) +SAL_THROW(()) { return s_implName; } @@ -386,35 +386,35 @@ Reference< XInterface > SAL_CALL scriptnri_create( SAL_THROW( ( Exception ) ); //************************************************************************* -Sequence< OUString > scriptnri_getSupportedServiceNames() SAL_THROW( () ); +Sequence< OUString > scriptnri_getSupportedServiceNames() SAL_THROW(()); //************************************************************************* -OUString scriptnri_getImplementationName() SAL_THROW( () ); +OUString scriptnri_getImplementationName() SAL_THROW(()); //******************** ScriptStorageMangaer defines *********************** Reference< XInterface > SAL_CALL ssm_create( Reference< XComponentContext > const & xComponentContext ) SAL_THROW( ( Exception ) ); //************************************************************************* -Sequence< OUString > ssm_getSupportedServiceNames() SAL_THROW( () ); +Sequence< OUString > ssm_getSupportedServiceNames() SAL_THROW(()); //************************************************************************* -OUString ssm_getImplementationName() SAL_THROW( () ); +OUString ssm_getImplementationName() SAL_THROW(()); //************************************************************************* //************ Script Provider defines ************************************ Reference< XInterface > SAL_CALL sp_create( const Reference< XComponentContext > & xCompC ); //******************** ScriptProvider defines *************************** -Sequence< OUString > sp_getSupportedServiceNames( ) SAL_THROW( () ); +Sequence< OUString > sp_getSupportedServiceNames( ) SAL_THROW(()); //************************************************************************* -OUString sp_getImplementationName( ) SAL_THROW( () ); +OUString sp_getImplementationName( ) SAL_THROW(()); //************************************************************************* //************ ScriptStorage defines ************************************** Reference< XInterface > SAL_CALL ss_create( const Reference< XComponentContext > & xCompC ); //******************** ScriptProvider defines *************************** -Sequence< OUString > ss_getSupportedServiceNames( ) SAL_THROW( () ); +Sequence< OUString > ss_getSupportedServiceNames( ) SAL_THROW(()); //************************************************************************* -OUString ss_getImplementationName( ) SAL_THROW( () ); +OUString ss_getImplementationName( ) SAL_THROW(()); //************************************************************************* diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index c15a6bb6dbac..ea1ac05269ef 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -97,7 +97,7 @@ static ::rtl::OUString getImplementationName_StringResourceImpl() static Reference< XInterface > SAL_CALL create_StringResourceImpl( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< ::cppu::OWeakObject * >( new StringResourcePersistenceImpl( xContext ) ); } @@ -2330,7 +2330,7 @@ static ::rtl::OUString getImplementationName_StringResourceWithStorageImpl() static Reference< XInterface > SAL_CALL create_StringResourceWithStorageImpl( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< ::cppu::OWeakObject * >( new StringResourceWithStorageImpl( xContext ) ); } @@ -2668,7 +2668,7 @@ static ::rtl::OUString getImplementationName_StringResourceWithLocationImpl() static Reference< XInterface > SAL_CALL create_StringResourceWithLocationImpl( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< ::cppu::OWeakObject * >( new StringResourceWithLocationImpl( xContext ) ); } diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 3b9cf401e39a..3b9cd949ee55 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -1127,7 +1127,7 @@ namespace evtlstner uno::Reference< XInterface > SAL_CALL create( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new EventListener( xContext ) ); } @@ -1157,7 +1157,7 @@ namespace ooevtdescgen uno::Reference< XInterface > SAL_CALL create( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new VBAToOOEventDescGen( xContext ) ); } diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index 640785acce8c..fee5ce6c83a3 100644 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.cxx @@ -44,7 +44,7 @@ namespace evtlstner uno::Reference< XInterface > SAL_CALL create( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ); + SAL_THROW(()); // ----------------------------------------------------------------------------- @@ -64,7 +64,7 @@ namespace ooevtdescgen uno::Reference< XInterface > SAL_CALL create( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ); + SAL_THROW(()); // ----------------------------------------------------------------------------- diff --git a/stoc/inc/bootstrapservices.hxx b/stoc/inc/bootstrapservices.hxx index f393a0487ab6..53f2ef81e49f 100644 --- a/stoc/inc/bootstrapservices.hxx +++ b/stoc/inc/bootstrapservices.hxx @@ -59,14 +59,14 @@ namespace stoc_bootstrap ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ac_create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xComponentContext ) SAL_THROW( (::com::sun::star::uno::Exception) ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > ac_getSupportedServiceNames() SAL_THROW( () ); - ::rtl::OUString ac_getImplementationName() SAL_THROW( () ); + ::com::sun::star::uno::Sequence< ::rtl::OUString > ac_getSupportedServiceNames() SAL_THROW(()); + ::rtl::OUString ac_getImplementationName() SAL_THROW(()); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL filepolicy_create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xComponentContext ) SAL_THROW( (com::sun::star::uno::Exception) ); - ::com::sun::star::uno::Sequence< rtl::OUString > filepolicy_getSupportedServiceNames() SAL_THROW( () ); - ::rtl::OUString filepolicy_getImplementationName() SAL_THROW( () ); + ::com::sun::star::uno::Sequence< rtl::OUString > filepolicy_getSupportedServiceNames() SAL_THROW(()); + ::rtl::OUString filepolicy_getImplementationName() SAL_THROW(()); //defaultregistry ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL NestedRegistry_CreateInstance( diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index ff075d4c1932..d49a8e7e90ea 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -116,7 +116,7 @@ public: FactoryImpl( Reference< XComponentContext > const & xContext ) SAL_THROW( (RuntimeException) ); - virtual ~FactoryImpl() SAL_THROW( () ); + virtual ~FactoryImpl() SAL_THROW(()); // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -173,11 +173,11 @@ struct AdapterImpl uno_Any * pSource, uno_Any * pExc ); inline void acquire() - SAL_THROW( () ); + SAL_THROW(()); inline void release() - SAL_THROW( () ); + SAL_THROW(()); inline ~AdapterImpl() - SAL_THROW( () ); + SAL_THROW(()); inline AdapterImpl( void * key, Reference< script::XInvocation > const & xReceiver, const Sequence< Type > & rTypes, @@ -186,7 +186,7 @@ struct AdapterImpl }; //______________________________________________________________________________ inline AdapterImpl::~AdapterImpl() - SAL_THROW( () ) + SAL_THROW(()) { for ( sal_Int32 nPos = m_nInterfaces; nPos--; ) { @@ -200,13 +200,13 @@ inline AdapterImpl::~AdapterImpl() } //______________________________________________________________________________ inline void AdapterImpl::acquire() - SAL_THROW( () ) + SAL_THROW(()) { ::osl_incrementInterlockedCount( &m_nRef ); } //______________________________________________________________________________ inline void AdapterImpl::release() - SAL_THROW( () ) + SAL_THROW(()) { bool delete_this = false; { @@ -245,7 +245,7 @@ static inline void constructRuntimeException( static inline sal_Bool type_equals( typelib_TypeDescriptionReference * pType1, typelib_TypeDescriptionReference * pType2 ) - SAL_THROW( () ) + SAL_THROW(()) { return (pType1 == pType2 || (pType1->pTypeName->length == pType2->pTypeName->length && @@ -780,7 +780,7 @@ FactoryImpl::FactoryImpl( Reference< XComponentContext > const & xContext ) g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } //______________________________________________________________________________ -FactoryImpl::~FactoryImpl() SAL_THROW( () ) +FactoryImpl::~FactoryImpl() SAL_THROW(()) { ::typelib_typedescription_release( m_pInvokMethodTD ); ::typelib_typedescription_release( m_pSetValueTD ); @@ -801,7 +801,7 @@ FactoryImpl::~FactoryImpl() SAL_THROW( () ) static inline AdapterImpl * lookup_adapter( t_ptr_set ** pp_adapter_set, t_ptr_map & map, void * key, Sequence< Type > const & rTypes ) - SAL_THROW( () ) + SAL_THROW(()) { t_ptr_set & adapters_set = map[ key ]; *pp_adapter_set = &adapters_set; diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx index f4c307514264..9d7a8e599ec2 100644 --- a/stoc/source/registry_tdprovider/tdprovider.cxx +++ b/stoc/source/registry_tdprovider/tdprovider.cxx @@ -132,7 +132,7 @@ class ProviderImpl com::sun::star::uno::Reference< XComponentContext > _xContext; com::sun::star::uno::WeakReference<XHierarchicalNameAccess> _xTDMgr; - com::sun::star::uno::Reference< XHierarchicalNameAccess > getTDMgr() SAL_THROW( () ); + com::sun::star::uno::Reference< XHierarchicalNameAccess > getTDMgr() SAL_THROW(()); RegistryKeyList _aBaseKeys; @@ -238,7 +238,7 @@ ProviderImpl::TypeDescriptionManagerWrapper::createTypeDescriptionEnumeration( //__________________________________________________________________________________________________ com::sun::star::uno::Reference< XHierarchicalNameAccess > ProviderImpl::getTDMgr() - SAL_THROW( () ) + SAL_THROW(()) { // harden weak reference: com::sun::star::uno::Reference<container::XHierarchicalNameAccess> xTDMgr( diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 1924db097c24..f2b029bcdaa4 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -94,16 +94,16 @@ class acc_Intersection inline acc_Intersection( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ) - SAL_THROW( () ); + SAL_THROW(()); public: virtual ~acc_Intersection() - SAL_THROW( () ); + SAL_THROW(()); static inline Reference< security::XAccessControlContext > create( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ) - SAL_THROW( () ); + SAL_THROW(()); // XAccessControlContext impl virtual void SAL_CALL checkPermission( @@ -114,7 +114,7 @@ public: inline acc_Intersection::acc_Intersection( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ) - SAL_THROW( () ) + SAL_THROW(()) : m_x1( x1 ) , m_x2( x2 ) { @@ -122,7 +122,7 @@ inline acc_Intersection::acc_Intersection( } //__________________________________________________________________________________________________ acc_Intersection::~acc_Intersection() - SAL_THROW( () ) + SAL_THROW(()) { g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } @@ -130,7 +130,7 @@ acc_Intersection::~acc_Intersection() inline Reference< security::XAccessControlContext > acc_Intersection::create( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ) - SAL_THROW( () ) + SAL_THROW(()) { if (! x1.is()) return x2; @@ -157,16 +157,16 @@ class acc_Union inline acc_Union( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ) - SAL_THROW( () ); + SAL_THROW(()); public: virtual ~acc_Union() - SAL_THROW( () ); + SAL_THROW(()); static inline Reference< security::XAccessControlContext > create( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ) - SAL_THROW( () ); + SAL_THROW(()); // XAccessControlContext impl virtual void SAL_CALL checkPermission( @@ -177,7 +177,7 @@ public: inline acc_Union::acc_Union( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ) - SAL_THROW( () ) + SAL_THROW(()) : m_x1( x1 ) , m_x2( x2 ) { @@ -185,7 +185,7 @@ inline acc_Union::acc_Union( } //__________________________________________________________________________________________________ acc_Union::~acc_Union() - SAL_THROW( () ) + SAL_THROW(()) { g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } @@ -193,7 +193,7 @@ acc_Union::~acc_Union() inline Reference< security::XAccessControlContext > acc_Union::create( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ) - SAL_THROW( () ) + SAL_THROW(()) { if (! x1.is()) return Reference< security::XAccessControlContext >(); // unrestricted @@ -226,9 +226,9 @@ class acc_Policy public: inline acc_Policy( PermissionCollection const & permissions ) - SAL_THROW( () ); + SAL_THROW(()); virtual ~acc_Policy() - SAL_THROW( () ); + SAL_THROW(()); // XAccessControlContext impl virtual void SAL_CALL checkPermission( @@ -238,14 +238,14 @@ public: //__________________________________________________________________________________________________ inline acc_Policy::acc_Policy( PermissionCollection const & permissions ) - SAL_THROW( () ) + SAL_THROW(()) : m_permissions( permissions ) { g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } //__________________________________________________________________________________________________ acc_Policy::~acc_Policy() - SAL_THROW( () ) + SAL_THROW(()) { g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } @@ -271,8 +271,8 @@ public: inline acc_CurrentContext( Reference< XCurrentContext > const & xDelegate, Reference< security::XAccessControlContext > const & xRestriction ) - SAL_THROW( () ); - virtual ~acc_CurrentContext() SAL_THROW( () ); + SAL_THROW(()); + virtual ~acc_CurrentContext() SAL_THROW(()); // XInterface impl virtual void SAL_CALL acquire() @@ -288,7 +288,7 @@ public: inline acc_CurrentContext::acc_CurrentContext( Reference< XCurrentContext > const & xDelegate, Reference< security::XAccessControlContext > const & xRestriction ) - SAL_THROW( () ) + SAL_THROW(()) : m_refcount( 0 ) , m_xDelegate( xDelegate ) { @@ -302,7 +302,7 @@ inline acc_CurrentContext::acc_CurrentContext( } //__________________________________________________________________________________________________ acc_CurrentContext::~acc_CurrentContext() - SAL_THROW( () ) + SAL_THROW(()) { g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } @@ -384,9 +384,9 @@ class cc_reset { void * m_cc; public: - inline cc_reset( void * cc ) SAL_THROW( () ) + inline cc_reset( void * cc ) SAL_THROW(()) : m_cc( cc ) {} - inline ~cc_reset() SAL_THROW( () ) + inline ~cc_reset() SAL_THROW(()) { ::uno_setCurrentContext( m_cc, s_envType.pData, 0 ); } }; @@ -425,7 +425,7 @@ class AccessController ThreadData m_rec; typedef vector< pair< OUString, Any > > t_rec_vec; - inline void clearPostPoned() SAL_THROW( () ); + inline void clearPostPoned() SAL_THROW(()); void checkAndClearPostPoned() SAL_THROW( (RuntimeException) ); PermissionCollection getEffectivePermissions( @@ -440,7 +440,7 @@ public: AccessController( Reference< XComponentContext > const & xComponentContext ) SAL_THROW( (RuntimeException) ); virtual ~AccessController() - SAL_THROW( () ); + SAL_THROW(()); // XInitialization impl virtual void SAL_CALL initialize( @@ -533,7 +533,7 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp } //__________________________________________________________________________________________________ AccessController::~AccessController() - SAL_THROW( () ) + SAL_THROW(()) { g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } @@ -599,7 +599,7 @@ Reference< security::XPolicy > const & AccessController::getPolicy() #ifdef __DIAGNOSE static void dumpPermissions( - PermissionCollection const & collection, OUString const & userId = OUString() ) SAL_THROW( () ) + PermissionCollection const & collection, OUString const & userId = OUString() ) SAL_THROW(()) { OUStringBuffer buf( 48 ); if (!userId.isEmpty()) @@ -628,7 +628,7 @@ static void dumpPermissions( //__________________________________________________________________________________________________ -inline void AccessController::clearPostPoned() SAL_THROW( () ) +inline void AccessController::clearPostPoned() SAL_THROW(()) { delete reinterpret_cast< t_rec_vec * >( m_rec.getData() ); m_rec.setData( 0 ); @@ -1039,14 +1039,14 @@ Reference< XInterface > SAL_CALL ac_create( return (OWeakObject *)new stoc_sec::AccessController( xComponentContext ); } //-------------------------------------------------------------------------------------------------- -Sequence< OUString > ac_getSupportedServiceNames() SAL_THROW( () ) +Sequence< OUString > ac_getSupportedServiceNames() SAL_THROW(()) { Sequence< OUString > aSNS( 1 ); aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME)); return aSNS; } //-------------------------------------------------------------------------------------------------- -OUString ac_getImplementationName() SAL_THROW( () ) +OUString ac_getImplementationName() SAL_THROW(()) { static OUString s_implName = OUSTR(IMPL_NAME); return s_implName; @@ -1056,9 +1056,9 @@ Reference< XInterface > SAL_CALL filepolicy_create( Reference< XComponentContext > const & xComponentContext ) SAL_THROW( (Exception) ); //-------------------------------------------------------------------------------------------------- -Sequence< OUString > filepolicy_getSupportedServiceNames() SAL_THROW( () ); +Sequence< OUString > filepolicy_getSupportedServiceNames() SAL_THROW(()); //-------------------------------------------------------------------------------------------------- -OUString filepolicy_getImplementationName() SAL_THROW( () ); +OUString filepolicy_getImplementationName() SAL_THROW(()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 9d45741c04e6..1a48ce1d921c 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -100,9 +100,9 @@ protected: public: FilePolicy( Reference< XComponentContext > const & xComponentContext ) - SAL_THROW( () ); + SAL_THROW(()); virtual ~FilePolicy() - SAL_THROW( () ); + SAL_THROW(()); // XPolicy impl virtual Sequence< Any > SAL_CALL getPermissions( @@ -123,7 +123,7 @@ public: }; //__________________________________________________________________________________________________ FilePolicy::FilePolicy( Reference< XComponentContext > const & xComponentContext ) - SAL_THROW( () ) + SAL_THROW(()) : t_helper( m_mutex ) , m_xComponentContext( xComponentContext ) , m_ac( xComponentContext ) @@ -133,7 +133,7 @@ FilePolicy::FilePolicy( Reference< XComponentContext > const & xComponentContext } //__________________________________________________________________________________________________ FilePolicy::~FilePolicy() - SAL_THROW( () ) + SAL_THROW(()) { g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } @@ -194,22 +194,22 @@ class PolicyReader sal_Unicode get() SAL_THROW( (RuntimeException) ); - inline void back( sal_Unicode c ) SAL_THROW( () ) + inline void back( sal_Unicode c ) SAL_THROW(()) { m_back = c; } - inline bool isWhiteSpace( sal_Unicode c ) const SAL_THROW( () ) + inline bool isWhiteSpace( sal_Unicode c ) const SAL_THROW(()) { return (' ' == c || '\t' == c || '\n' == c || '\r' == c); } void skipWhiteSpace() SAL_THROW( (RuntimeException) ); - inline bool isCharToken( sal_Unicode c ) const SAL_THROW( () ) + inline bool isCharToken( sal_Unicode c ) const SAL_THROW(()) { return (';' == c || ',' == c || '{' == c || '}' == c); } public: PolicyReader( OUString const & file, AccessControl & ac ) SAL_THROW( (RuntimeException) ); ~PolicyReader() - SAL_THROW( () ); + SAL_THROW(()); void error( OUString const & msg ) SAL_THROW( (RuntimeException) ); @@ -425,7 +425,7 @@ PolicyReader::PolicyReader( OUString const & fileName, AccessControl & ac ) } //__________________________________________________________________________________________________ PolicyReader::~PolicyReader() - SAL_THROW( () ) + SAL_THROW(()) { if ( ::osl_closeFile( m_file ) != osl_File_E_None ) { OSL_ASSERT( false ); @@ -585,14 +585,14 @@ Reference< XInterface > SAL_CALL filepolicy_create( return (OWeakObject *)new stoc_sec::FilePolicy( xComponentContext ); } //-------------------------------------------------------------------------------------------------- -Sequence< OUString > filepolicy_getSupportedServiceNames() SAL_THROW( () ) +Sequence< OUString > filepolicy_getSupportedServiceNames() SAL_THROW(()) { Sequence< OUString > aSNS( 1 ); aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME)); return aSNS; } //-------------------------------------------------------------------------------------------------- -OUString filepolicy_getImplementationName() SAL_THROW( () ) +OUString filepolicy_getImplementationName() SAL_THROW(()) { static OUString s_implName = OUSTR(IMPL_NAME); return s_implName; diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h index 6853a374a186..52b53ac306ff 100644 --- a/stoc/source/security/lru_cache.h +++ b/stoc/source/security/lru_cache.h @@ -61,57 +61,57 @@ class lru_cache Entry * m_block; mutable Entry * m_head; mutable Entry * m_tail; - inline void toFront( Entry * entry ) const SAL_THROW( () ); + inline void toFront( Entry * entry ) const SAL_THROW(()); public: /** Default Ctor. Does not cache. */ - inline lru_cache() SAL_THROW( () ); + inline lru_cache() SAL_THROW(()); /** Ctor. @param size number of elements to be cached; default param set to 128 */ - inline lru_cache( ::std::size_t size ) SAL_THROW( () ); + inline lru_cache( ::std::size_t size ) SAL_THROW(()); /** Destructor: releases all cached elements and keys. */ - inline ~lru_cache() SAL_THROW( () ); + inline ~lru_cache() SAL_THROW(()); /** Retrieves a pointer to value in cache. Returns 0, if none was found. @param key a key @return pointer to value or 0 */ - inline t_val const * lookup( t_key const & key ) const SAL_THROW( () ); + inline t_val const * lookup( t_key const & key ) const SAL_THROW(()); /** Sets a value to be cached for given key. @param key a key @param val a value */ - inline void set( t_key const & key, t_val const & val ) SAL_THROW( () ); + inline void set( t_key const & key, t_val const & val ) SAL_THROW(()); /** Tests whether a value is cached for given key. @param key a key @return true, if value is cached */ - inline bool has( t_key const & key ) const SAL_THROW( () ); + inline bool has( t_key const & key ) const SAL_THROW(()); /** Clears the cache, releasing all cached elements and keys. */ - inline void clear() SAL_THROW( () ); + inline void clear() SAL_THROW(()); /** Sets the number of elements to be cached. This will clear previous entries. @param cacheSize number of elements to be cached */ - inline void setSize( ::std::size_t size ) SAL_THROW( () ); + inline void setSize( ::std::size_t size ) SAL_THROW(()); }; //__________________________________________________________________________________________________ template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::setSize( - ::std::size_t size ) SAL_THROW( () ) + ::std::size_t size ) SAL_THROW(()) { m_key2element.clear(); delete [] m_block; @@ -133,7 +133,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::setSize( //__________________________________________________________________________________________________ template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lru_cache( - ::std::size_t size ) SAL_THROW( () ) + ::std::size_t size ) SAL_THROW(()) : m_size( 0 ) , m_block( 0 ) { @@ -141,7 +141,7 @@ inline lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lru_cache( } //__________________________________________________________________________________________________ template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > -inline lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lru_cache() SAL_THROW( () ) +inline lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lru_cache() SAL_THROW(()) : m_size( 0 ) , m_block( 0 ) { @@ -149,14 +149,14 @@ inline lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lru_cache() SAL_THROW( //__________________________________________________________________________________________________ template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline lru_cache< t_key, t_val, t_hashKey, t_equalKey >::~lru_cache() - SAL_THROW( () ) + SAL_THROW(()) { delete [] m_block; } //__________________________________________________________________________________________________ template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::toFront( - Entry * entry ) const SAL_THROW( () ) + Entry * entry ) const SAL_THROW(()) { if (entry != m_head) { @@ -179,7 +179,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::toFront( //__________________________________________________________________________________________________ template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline bool lru_cache< t_key, t_val, t_hashKey, t_equalKey >::has( - t_key const & key ) const SAL_THROW( () ) + t_key const & key ) const SAL_THROW(()) { typename t_key2element::const_iterator const iFind( m_key2element.find( key ) ); return (iFind != m_key2element.end()); @@ -187,7 +187,7 @@ inline bool lru_cache< t_key, t_val, t_hashKey, t_equalKey >::has( //__________________________________________________________________________________________________ template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline t_val const * lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lookup( - t_key const & key ) const SAL_THROW( () ) + t_key const & key ) const SAL_THROW(()) { if (0 < m_size) { @@ -213,7 +213,7 @@ inline t_val const * lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lookup( //__________________________________________________________________________________________________ template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set( - t_key const & key, t_val const & val ) SAL_THROW( () ) + t_key const & key, t_val const & val ) SAL_THROW(()) { if (0 < m_size) { @@ -263,7 +263,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set( } //__________________________________________________________________________________________________ template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > -inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::clear() SAL_THROW( () ) +inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::clear() SAL_THROW(()) { m_key2element.clear(); for ( ::std::size_t nPos = m_size; nPos--; ) diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index 6b065ede2eb8..93715e8c48b3 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -59,7 +59,7 @@ namespace stoc_sec //-------------------------------------------------------------------------------------------------- static inline sal_Int32 makeMask( - OUString const & items, char const * const * strings ) SAL_THROW( () ) + OUString const & items, char const * const * strings ) SAL_THROW(()) { sal_Int32 mask = 0; @@ -96,7 +96,7 @@ static inline sal_Int32 makeMask( } //-------------------------------------------------------------------------------------------------- static inline OUString makeStrings( - sal_Int32 mask, char const * const * strings ) SAL_THROW( () ) + sal_Int32 mask, char const * const * strings ) SAL_THROW(()) { OUStringBuffer buf( 48 ); while (mask) @@ -129,15 +129,15 @@ class SocketPermission : public Permission mutable bool m_resolvedHost; bool m_wildCardHost; - inline bool resolveHost() const SAL_THROW( () ); + inline bool resolveHost() const SAL_THROW(()); public: SocketPermission( connection::SocketPermission const & perm, ::rtl::Reference< Permission > const & next = ::rtl::Reference< Permission >() ) - SAL_THROW( () ); - virtual bool implies( Permission const & perm ) const SAL_THROW( () ); - virtual OUString toString() const SAL_THROW( () ); + SAL_THROW(()); + virtual bool implies( Permission const & perm ) const SAL_THROW(()); + virtual OUString toString() const SAL_THROW(()); }; //__________________________________________________________________________________________________ char const * SocketPermission::s_actions [] = { "accept", "connect", "listen", "resolve", 0 }; @@ -145,7 +145,7 @@ char const * SocketPermission::s_actions [] = { "accept", "connect", "listen", " SocketPermission::SocketPermission( connection::SocketPermission const & perm, ::rtl::Reference< Permission > const & next ) - SAL_THROW( () ) + SAL_THROW(()) : Permission( SOCKET, next ) , m_actions( makeMask( perm.Actions, s_actions ) ) , m_host( perm.Host ) @@ -184,7 +184,7 @@ SocketPermission::SocketPermission( } } //__________________________________________________________________________________________________ -inline bool SocketPermission::resolveHost() const SAL_THROW( () ) +inline bool SocketPermission::resolveHost() const SAL_THROW(()) { if (m_resolveErr) return false; @@ -210,7 +210,7 @@ inline bool SocketPermission::resolveHost() const SAL_THROW( () ) return m_resolvedHost; } //__________________________________________________________________________________________________ -bool SocketPermission::implies( Permission const & perm ) const SAL_THROW( () ) +bool SocketPermission::implies( Permission const & perm ) const SAL_THROW(()) { // check type if (SOCKET != perm.m_type) @@ -252,7 +252,7 @@ bool SocketPermission::implies( Permission const & perm ) const SAL_THROW( () ) return (sal_False != m_ip.equals( demanded.m_ip )); } //__________________________________________________________________________________________________ -OUString SocketPermission::toString() const SAL_THROW( () ) +OUString SocketPermission::toString() const SAL_THROW(()) { OUStringBuffer buf( 48 ); // host @@ -300,14 +300,14 @@ public: FilePermission( io::FilePermission const & perm, ::rtl::Reference< Permission > const & next = ::rtl::Reference< Permission >() ) - SAL_THROW( () ); - virtual bool implies( Permission const & perm ) const SAL_THROW( () ); - virtual OUString toString() const SAL_THROW( () ); + SAL_THROW(()); + virtual bool implies( Permission const & perm ) const SAL_THROW(()); + virtual OUString toString() const SAL_THROW(()); }; //__________________________________________________________________________________________________ char const * FilePermission::s_actions [] = { "read", "write", "execute", "delete", 0 }; //-------------------------------------------------------------------------------------------------- -static OUString const & getWorkingDir() SAL_THROW( () ) +static OUString const & getWorkingDir() SAL_THROW(()) { static OUString * s_workingDir = 0; if (! s_workingDir) @@ -328,7 +328,7 @@ static OUString const & getWorkingDir() SAL_THROW( () ) FilePermission::FilePermission( io::FilePermission const & perm, ::rtl::Reference< Permission > const & next ) - SAL_THROW( () ) + SAL_THROW(()) : Permission( FILE, next ) , m_actions( makeMask( perm.Actions, s_actions ) ) , m_url( perm.URL ) @@ -370,7 +370,7 @@ FilePermission::FilePermission( } } //__________________________________________________________________________________________________ -bool FilePermission::implies( Permission const & perm ) const SAL_THROW( () ) +bool FilePermission::implies( Permission const & perm ) const SAL_THROW(()) { // check type if (FILE != perm.m_type) @@ -429,7 +429,7 @@ bool FilePermission::implies( Permission const & perm ) const SAL_THROW( () ) return false; } //__________________________________________________________________________________________________ -OUString FilePermission::toString() const SAL_THROW( () ) +OUString FilePermission::toString() const SAL_THROW(()) { OUStringBuffer buf( 48 ); // url @@ -453,15 +453,15 @@ public: inline RuntimePermission( security::RuntimePermission const & perm, ::rtl::Reference< Permission > const & next = ::rtl::Reference< Permission >() ) - SAL_THROW( () ) + SAL_THROW(()) : Permission( RUNTIME, next ) , m_name( perm.Name ) {} - virtual bool implies( Permission const & perm ) const SAL_THROW( () ); - virtual OUString toString() const SAL_THROW( () ); + virtual bool implies( Permission const & perm ) const SAL_THROW(()); + virtual OUString toString() const SAL_THROW(()); }; //__________________________________________________________________________________________________ -bool RuntimePermission::implies( Permission const & perm ) const SAL_THROW( () ) +bool RuntimePermission::implies( Permission const & perm ) const SAL_THROW(()) { // check type if (RUNTIME != perm.m_type) @@ -472,7 +472,7 @@ bool RuntimePermission::implies( Permission const & perm ) const SAL_THROW( () ) return (sal_False != m_name.equals( demanded.m_name )); } //__________________________________________________________________________________________________ -OUString RuntimePermission::toString() const SAL_THROW( () ) +OUString RuntimePermission::toString() const SAL_THROW(()) { OUStringBuffer buf( 48 ); buf.appendAscii( @@ -485,12 +485,12 @@ OUString RuntimePermission::toString() const SAL_THROW( () ) //################################################################################################## //__________________________________________________________________________________________________ -bool AllPermission::implies( Permission const & ) const SAL_THROW( () ) +bool AllPermission::implies( Permission const & ) const SAL_THROW(()) { return true; } //__________________________________________________________________________________________________ -OUString AllPermission::toString() const SAL_THROW( () ) +OUString AllPermission::toString() const SAL_THROW(()) { return OUSTR("com.sun.star.security.AllPermission"); } @@ -542,7 +542,7 @@ PermissionCollection::PermissionCollection( } #ifdef __DIAGNOSE //__________________________________________________________________________________________________ -Sequence< OUString > PermissionCollection::toStrings() const SAL_THROW( () ) +Sequence< OUString > PermissionCollection::toStrings() const SAL_THROW(()) { vector< OUString > strings; strings.reserve( 8 ); @@ -556,7 +556,7 @@ Sequence< OUString > PermissionCollection::toStrings() const SAL_THROW( () ) #endif //__________________________________________________________________________________________________ inline static bool __implies( - ::rtl::Reference< Permission > const & head, Permission const & demanded ) SAL_THROW( () ) + ::rtl::Reference< Permission > const & head, Permission const & demanded ) SAL_THROW(()) { for ( Permission * perm = head.get(); perm; perm = perm->m_next.get() ) { @@ -570,7 +570,7 @@ inline static bool __implies( //-------------------------------------------------------------------------------------------------- static void demanded_diag( Permission const & perm ) - SAL_THROW( () ) + SAL_THROW(()) { OUStringBuffer buf( 48 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("demanding ") ); diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h index 898759482a6e..28f80d04a660 100644 --- a/stoc/source/security/permissions.h +++ b/stoc/source/security/permissions.h @@ -52,13 +52,13 @@ public: inline Permission( t_type type, ::rtl::Reference< Permission > const & next = ::rtl::Reference< Permission >() ) - SAL_THROW( () ) + SAL_THROW(()) : m_next( next ) , m_type( type ) {} - virtual bool implies( Permission const & perm ) const SAL_THROW( () ) = 0; - virtual ::rtl::OUString toString() const SAL_THROW( () ) = 0; + virtual bool implies( Permission const & perm ) const SAL_THROW(()) = 0; + virtual ::rtl::OUString toString() const SAL_THROW(()) = 0; }; //================================================================================================== class AllPermission : public Permission @@ -66,12 +66,12 @@ class AllPermission : public Permission public: inline AllPermission( ::rtl::Reference< Permission > const & next = ::rtl::Reference< Permission >() ) - SAL_THROW( () ) + SAL_THROW(()) : Permission( ALL, next ) {} - virtual bool implies( Permission const & ) const SAL_THROW( () ); - virtual ::rtl::OUString toString() const SAL_THROW( () ); + virtual bool implies( Permission const & ) const SAL_THROW(()); + virtual ::rtl::OUString toString() const SAL_THROW(()); }; //================================================================================================== @@ -79,12 +79,12 @@ class PermissionCollection { ::rtl::Reference< Permission > m_head; public: - inline PermissionCollection() SAL_THROW( () ) + inline PermissionCollection() SAL_THROW(()) {} - inline PermissionCollection( PermissionCollection const & collection ) SAL_THROW( () ) + inline PermissionCollection( PermissionCollection const & collection ) SAL_THROW(()) : m_head( collection.m_head ) {} - inline PermissionCollection( ::rtl::Reference< Permission > const & single ) SAL_THROW( () ) + inline PermissionCollection( ::rtl::Reference< Permission > const & single ) SAL_THROW(()) : m_head( single ) {} PermissionCollection( @@ -92,7 +92,7 @@ public: PermissionCollection const & addition = PermissionCollection() ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); #ifdef __DIAGNOSE - ::com::sun::star::uno::Sequence< ::rtl::OUString > toStrings() const SAL_THROW( () ); + ::com::sun::star::uno::Sequence< ::rtl::OUString > toStrings() const SAL_THROW(()); #endif void checkPermission( ::com::sun::star::uno::Any const & perm ) const SAL_THROW( (::com::sun::star::uno::RuntimeException) ); diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 7b1a875fe159..bb65892578a3 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -280,7 +280,7 @@ class PropertySetInfo_Impl : public WeakImplHelper1< beans::XPropertySetInfo > Sequence< beans::Property > m_properties; public: - inline PropertySetInfo_Impl( Sequence< beans::Property > const & properties ) SAL_THROW( () ) + inline PropertySetInfo_Impl( Sequence< beans::Property > const & properties ) SAL_THROW(()) : m_properties( properties ) {} @@ -638,7 +638,7 @@ public: OServiceManagerWrapper( Reference< XComponentContext > const & xContext ) SAL_THROW( (RuntimeException) ); - virtual ~OServiceManagerWrapper() SAL_THROW( () ); + virtual ~OServiceManagerWrapper() SAL_THROW(()); // XUnoTunnel sal_Int64 SAL_CALL getSomething( Sequence< sal_Int8 > const & id ) throw (RuntimeException) @@ -780,7 +780,7 @@ void OServiceManagerWrapper::disposing() } } //__________________________________________________________________________________________________ -OServiceManagerWrapper::~OServiceManagerWrapper() SAL_THROW( () ) +OServiceManagerWrapper::~OServiceManagerWrapper() SAL_THROW(()) { if (m_root) { diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index d19c8a3a0232..d98cf3e33150 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -91,7 +91,7 @@ static const sal_Int64 SAL_INT64_MIN = #ifdef _MSC_VER static const double DOUBLE_SAL_UINT64_MAX = ((((double)SAL_INT64_MAX) * 2) + 1); -static inline double unsigned_int64_to_double( sal_uInt64 n ) SAL_THROW( () ) +static inline double unsigned_int64_to_double( sal_uInt64 n ) SAL_THROW(()) { sal_uInt64 n2 = (n / 3); n -= (2 * n2); @@ -101,7 +101,7 @@ static inline double unsigned_int64_to_double( sal_uInt64 n ) SAL_THROW( () ) static const double DOUBLE_SAL_UINT64_MAX = (double)((((sal_uInt64)0xffffffff) << 32) | (sal_uInt64)0xffffffff); -static inline double unsigned_int64_to_double( sal_uInt64 n ) SAL_THROW( () ) +static inline double unsigned_int64_to_double( sal_uInt64 n ) SAL_THROW(()) { return (double)n; } diff --git a/stoc/test/security/test_security.cxx b/stoc/test/security/test_security.cxx index 08ecd5b17762..b8809dea0885 100644 --- a/stoc/test/security/test_security.cxx +++ b/stoc/test/security/test_security.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; //-------------------------------------------------------------------------------------------------- -static OUString localhost( OUString const & addition ) SAL_THROW( () ) +static OUString localhost( OUString const & addition ) SAL_THROW(()) { static OUString ip; if (! ip.getLength()) @@ -97,7 +97,7 @@ public: inline user_CurrentContext( Reference< XCurrentContext > const & xDelegate, OUString const & userId ) - SAL_THROW( () ) + SAL_THROW(()) : m_refcount( 0 ) , m_xDelegate( xDelegate ) , m_userId( makeAny( userId ) ) @@ -371,7 +371,7 @@ class acc_Restr Any m_perm; public: - inline acc_Restr( Any const & perm = Any() ) SAL_THROW( () ) + inline acc_Restr( Any const & perm = Any() ) SAL_THROW(()) : m_perm( perm ) {} @@ -401,7 +401,7 @@ class Action Any m_arg; public: - inline Action( t_action action, AccessControl & ac, Any const & arg = Any() ) SAL_THROW( () ) + inline Action( t_action action, AccessControl & ac, Any const & arg = Any() ) SAL_THROW(()) : m_action( action ) , m_ac( ac ) , m_arg( arg ) diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx index 4f8c733a79c3..ce0ed266a538 100644 --- a/ucb/source/ucp/ftp/ftpdirp.hxx +++ b/ucb/source/ucp/ftp/ftpdirp.hxx @@ -56,7 +56,7 @@ namespace ftp { const sal_uInt16& hours, const sal_uInt16& day, const sal_uInt16& month, - const sal_uInt16& year) SAL_THROW( () ) + const sal_uInt16& year) SAL_THROW(()) : com::sun::star::util::DateTime(hundredthSeconds, seconds, minutes, diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index a395bf548008..3c64fbe0dcff 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -376,7 +376,7 @@ StorageElementFactory::createStream( const rtl::OUString & rUri, } //========================================================================= -void StorageElementFactory::releaseElement( Storage * pElement ) SAL_THROW( () ) +void StorageElementFactory::releaseElement( Storage * pElement ) SAL_THROW(()) { OSL_ASSERT( pElement ); osl::MutexGuard aGuard( m_aMutex ); diff --git a/unotools/inc/unotools/sharedunocomponent.hxx b/unotools/inc/unotools/sharedunocomponent.hxx index e4065387b6fb..c1e79b2aa141 100644 --- a/unotools/inc/unotools/sharedunocomponent.hxx +++ b/unotools/inc/unotools/sharedunocomponent.hxx @@ -282,14 +282,14 @@ namespace utl //------------------------------------------------------------------------- // conversion to Any template < class INTERFACE, class COMPONENT > - inline void SAL_CALL operator <<= ( ::com::sun::star::uno::Any & rAny, const SharedUNOComponent< INTERFACE, COMPONENT >& value ) SAL_THROW( () ) + inline void SAL_CALL operator <<= ( ::com::sun::star::uno::Any & rAny, const SharedUNOComponent< INTERFACE, COMPONENT >& value ) SAL_THROW(()) { rAny <<= value.getTyped(); } //------------------------------------------------------------------------- template < class INTERFACE, class COMPONENT > - inline ::com::sun::star::uno::Any SAL_CALL makeAny( const SharedUNOComponent< INTERFACE, COMPONENT >& value ) SAL_THROW( () ) + inline ::com::sun::star::uno::Any SAL_CALL makeAny( const SharedUNOComponent< INTERFACE, COMPONENT >& value ) SAL_THROW(()) { return makeAny( value.getTyped() ); } diff --git a/vbahelper/inc/vbahelper/weakreference.hxx b/vbahelper/inc/vbahelper/weakreference.hxx index a2640e7ae91b..18d45561cf26 100644 --- a/vbahelper/inc/vbahelper/weakreference.hxx +++ b/vbahelper/inc/vbahelper/weakreference.hxx @@ -52,16 +52,16 @@ class WeakReference public: /** Default constructor. Creates an empty weak reference. */ - inline explicit WeakReference() SAL_THROW( () ) : mpObject( 0 ) {} + inline explicit WeakReference() SAL_THROW(()) : mpObject( 0 ) {} /** Initializes this weak reference with the passed reference to an object. */ - inline explicit WeakReference( const ::rtl::Reference< ObjectType >& rxObject ) SAL_THROW( () ) : + inline explicit WeakReference( const ::rtl::Reference< ObjectType >& rxObject ) SAL_THROW(()) : mxWeakRef( rxObject.get() ), mpObject( rxObject.get() ) {} /** Releases this weak reference and takes over the passed reference. */ - inline WeakReference& SAL_CALL operator=( const ::rtl::Reference< ObjectType >& rxObject ) SAL_THROW( () ) + inline WeakReference& SAL_CALL operator=( const ::rtl::Reference< ObjectType >& rxObject ) SAL_THROW(()) { mxWeakRef = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak >( rxObject.get() ); mpObject = rxObject.get(); @@ -72,7 +72,7 @@ public: @return Reference or null, if the weakly referenced object is gone. */ - inline SAL_CALL operator ::rtl::Reference< ObjectType >() SAL_THROW( () ) + inline SAL_CALL operator ::rtl::Reference< ObjectType >() SAL_THROW(()) { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak > xRef = mxWeakRef; ::rtl::Reference< ObjectType > xObject; diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/xmlscript/inc/xmlscript/xml_helper.hxx index 48c0905a0b49..14a6bfae7455 100644 --- a/xmlscript/inc/xmlscript/xml_helper.hxx +++ b/xmlscript/inc/xmlscript/xml_helper.hxx @@ -52,7 +52,7 @@ class XCR_DLLPUBLIC XMLElement { public: inline XMLElement( ::rtl::OUString const & name ) - SAL_THROW( () ) + SAL_THROW(()) : _name( name ) {} @@ -62,14 +62,14 @@ public: */ void SAL_CALL addSubElement( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > const & xElem ) - SAL_THROW( () ); + SAL_THROW(()); /** Gets sub element of given index. The index follows order in which sub elements were added. @param nIndex index of sub element */ ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > SAL_CALL getSubElement( sal_Int32 nIndex ) - SAL_THROW( () ); + SAL_THROW(()); /** Adds an attribute to elements. @@ -77,14 +77,14 @@ public: @param rValue value string of element */ void SAL_CALL addAttribute( ::rtl::OUString const & rAttrName, ::rtl::OUString const & rValue ) - SAL_THROW( () ); + SAL_THROW(()); /** Gets the tag name (qname) of element. @return qname of element */ - inline ::rtl::OUString SAL_CALL getName() SAL_THROW( () ) + inline ::rtl::OUString SAL_CALL getName() SAL_THROW(()) { return _name; } /** Dumps out element (and all sub elements). @@ -135,13 +135,13 @@ protected: XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL createInputStream( ::rtl::ByteSequence const & rInData ) - SAL_THROW( () ); + SAL_THROW(()); //================================================================================================== XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL createOutputStream( ::rtl::ByteSequence * pOutData ) - SAL_THROW( () ); + SAL_THROW(()); } diff --git a/xmlscript/source/inc/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx index 2e36643379fd..f6df8b297e0b 100644 --- a/xmlscript/source/inc/xml_import.hxx +++ b/xmlscript/source/inc/xml_import.hxx @@ -59,7 +59,7 @@ SAL_CALL createDocumentHandler( ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XRoot > const & xRoot, bool bSingleThreadedUse = true ) - SAL_THROW( () ); + SAL_THROW(()); } diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx index 2f3d90407c6a..17c2a3f8afdd 100644 --- a/xmlscript/source/xml_helper/xml_byteseq.cxx +++ b/xmlscript/source/xml_helper/xml_byteseq.cxx @@ -50,7 +50,7 @@ class BSeqInputStream public: inline BSeqInputStream( ByteSequence const & rSeq ) - SAL_THROW( () ) + SAL_THROW(()) : _seq( rSeq ) , _nPos( 0 ) {} @@ -119,7 +119,7 @@ class BSeqOutputStream public: inline BSeqOutputStream( ByteSequence * seq ) - SAL_THROW( () ) + SAL_THROW(()) : _seq( seq ) {} @@ -157,14 +157,14 @@ void BSeqOutputStream::closeOutput() //================================================================================================== Reference< io::XInputStream > SAL_CALL createInputStream( ByteSequence const & rInData ) - SAL_THROW( () ) + SAL_THROW(()) { return new BSeqInputStream( rInData ); } //================================================================================================== Reference< io::XOutputStream > SAL_CALL createOutputStream( ByteSequence * pOutData ) - SAL_THROW( () ) + SAL_THROW(()) { return new BSeqOutputStream( pOutData ); } diff --git a/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx index 89ec4a498d3f..54a12bfe8e11 100644 --- a/xmlscript/source/xml_helper/xml_element.cxx +++ b/xmlscript/source/xml_helper/xml_element.cxx @@ -38,20 +38,20 @@ namespace xmlscript //__________________________________________________________________________________________________ void XMLElement::addAttribute( OUString const & rAttrName, OUString const & rValue ) - SAL_THROW( () ) + SAL_THROW(()) { _attrNames.push_back( rAttrName ); _attrValues.push_back( rValue ); } //__________________________________________________________________________________________________ void XMLElement::addSubElement( Reference< xml::sax::XAttributeList > const & xElem ) - SAL_THROW( () ) + SAL_THROW(()) { _subElems.push_back( xElem ); } //__________________________________________________________________________________________________ Reference< xml::sax::XAttributeList > XMLElement::getSubElement( sal_Int32 nIndex ) - SAL_THROW( () ) + SAL_THROW(()) { return _subElems[ (size_t)nIndex ]; } diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index 5b6315cda78c..ebe47ef90970 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -76,7 +76,7 @@ struct PrefixEntry { ::std::vector< sal_Int32 > m_Uids; - inline PrefixEntry() SAL_THROW( () ) + inline PrefixEntry() SAL_THROW(()) { m_Uids.reserve( 4 ); } }; @@ -879,7 +879,7 @@ OUString ExtendedAttributes::getValueByUidName( Reference< xml::sax::XDocumentHandler > SAL_CALL createDocumentHandler( Reference< xml::input::XRoot > const & xRoot, bool bSingleThreadedUse ) - SAL_THROW( () ) + SAL_THROW(()) { OSL_ASSERT( xRoot.is() ); if (xRoot.is()) diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx index 89a4ee013173..2f15855b21d0 100644 --- a/xmlscript/source/xmldlg_imexp/exp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx @@ -64,7 +64,7 @@ struct Style ::rtl::OUString _id; - inline Style( short all_ ) SAL_THROW( () ) + inline Style( short all_ ) SAL_THROW(()) : _fontRelief( css::awt::FontRelief::NONE ) , _fontEmphasisMark( css::awt::FontEmphasisMark::NONE ) , _all( all_ ) @@ -78,9 +78,9 @@ class StyleBag ::std::vector< Style * > _styles; public: - ~StyleBag() SAL_THROW( () ); + ~StyleBag() SAL_THROW(()); - ::rtl::OUString getStyleId( Style const & rStyle ) SAL_THROW( () ); + ::rtl::OUString getStyleId( Style const & rStyle ) SAL_THROW(()); void dump( css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > const & xOut ); @@ -98,7 +98,7 @@ public: css::uno::Reference< css::beans::XPropertySet > const & xProps, css::uno::Reference< css::beans::XPropertyState > const & xPropState, ::rtl::OUString const & name, css::uno::Reference< css::frame::XModel > const & xDocument ) - SAL_THROW( () ) + SAL_THROW(()) : XMLElement( name ) , _xProps( xProps ) , _xPropState( xPropState ) @@ -106,7 +106,7 @@ public: {} inline ElementDescriptor( ::rtl::OUString const & name ) - SAL_THROW( () ) + SAL_THROW(()) : XMLElement( name ) {} diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index 5b9b9a5adfd9..b915a18d04ce 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -52,7 +52,7 @@ namespace css = ::com::sun::star; namespace xmlscript { -inline sal_Int32 toInt32( ::rtl::OUString const & rStr ) SAL_THROW( () ) +inline sal_Int32 toInt32( ::rtl::OUString const & rStr ) SAL_THROW(()) { sal_Int32 nVal; if (rStr.getLength() > 2 && rStr[ 0 ] == '0' && rStr[ 1 ] == 'x') @@ -152,13 +152,13 @@ public: void addStyle( ::rtl::OUString const & rStyleId, css::uno::Reference< css::xml::input::XElement > const & xStyle ) - SAL_THROW( () ); + SAL_THROW(()); css::uno::Reference< css::xml::input::XElement > getStyle( ::rtl::OUString const & rStyleId ) const - SAL_THROW( () ); + SAL_THROW(()); inline css::uno::Reference< css::uno::XComponentContext > - const & getComponentContext() SAL_THROW( () ) { return _xContext; } + const & getComponentContext() SAL_THROW(()) { return _xContext; } css::uno::Reference< css::util::XNumberFormatsSupplier > const & getNumberFormatsSupplier(); @@ -169,7 +169,7 @@ public: ::boost::shared_ptr< ::std::vector< ::rtl::OUString > >& pStyleNames, ::boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > >& pStyles, css::uno::Reference<css::frame::XModel> const & xDoc ) - SAL_THROW( () ) + SAL_THROW(()) : _xContext( xContext ) , _pStyleNames( pStyleNames ) , _pStyles( pStyles ) @@ -189,7 +189,7 @@ public: , XMLNS_SCRIPT_UID( rOther.XMLNS_SCRIPT_UID ) {} virtual ~DialogImport() - SAL_THROW( () ); + SAL_THROW(()); inline css::uno::Reference< css::frame::XModel > getDocOwner() { return _xDoc; } @@ -230,9 +230,9 @@ public: sal_Int32 nUid, ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ); + SAL_THROW(()); virtual ~ElementBase() - SAL_THROW( () ); + SAL_THROW(()); // XElement virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent() @@ -275,7 +275,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ElementBase( pImport->XMLNS_DIALOGS_UID, rLocalName, xAttributes, pParent, pImport ) {} @@ -330,7 +330,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ElementBase( pImport->XMLNS_DIALOGS_UID, rLocalName, xAttributes, pParent, pImport ) , _fontRelief( css::awt::FontRelief::NONE ) @@ -360,7 +360,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ElementBase( pImport->XMLNS_DIALOGS_UID, rLocalName, xAttributes, pParent, pImport ) {} @@ -386,13 +386,13 @@ protected: css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ); public: ::std::vector<css::uno::Reference< css::xml::input::XElement> > *getEvents() - SAL_THROW( () ) { return &_events; } + SAL_THROW(()) { return &_events; } ControlElement( ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ); + SAL_THROW(()); }; //============================================================================== @@ -530,7 +530,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -547,7 +547,7 @@ public: sal_Int32 nUid, ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ElementBase( nUid, rLocalName, xAttributes, pParent, pImport ) {} }; @@ -567,7 +567,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ); + SAL_THROW(()); }; //============================================================================== @@ -587,7 +587,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -609,7 +609,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -632,7 +632,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -655,7 +655,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -675,7 +675,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -698,7 +698,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -722,7 +722,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : BulletinBoardElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -744,7 +744,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -765,7 +765,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -786,7 +786,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -808,7 +808,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -830,7 +830,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -852,7 +852,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -874,7 +874,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -896,7 +896,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -918,7 +918,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -940,7 +940,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -962,7 +962,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -984,7 +984,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -1006,7 +1006,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -1028,7 +1028,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -1051,7 +1051,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -1073,7 +1073,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) { m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ), css::uno::UNO_QUERY ); @@ -1100,7 +1100,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} private: @@ -1124,7 +1124,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) { m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoPageModel") ) ), css::uno::UNO_QUERY ); @@ -1150,7 +1150,7 @@ public: ::rtl::OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) {} }; diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index 2084860bbc58..ece2ca87a585 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -1336,7 +1336,7 @@ inline bool equalFont( Style const & style1, Style const & style2 ) } //__________________________________________________________________________________________________ OUString StyleBag::getStyleId( Style const & rStyle ) - SAL_THROW( () ) + SAL_THROW(()) { if (! rStyle._set) // nothin set { @@ -1414,7 +1414,7 @@ OUString StyleBag::getStyleId( Style const & rStyle ) return pStyle->_id; } //__________________________________________________________________________________________________ -StyleBag::~StyleBag() SAL_THROW( () ) +StyleBag::~StyleBag() SAL_THROW(()) { for ( size_t nPos = 0; nPos < _styles.size(); ++nPos ) { diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index c59d630e46bc..ced4c0db9d3f 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -2407,7 +2407,7 @@ BulletinBoardElement::BulletinBoardElement( OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ControlElement( rLocalName, xAttributes, pParent, pImport ) { OUString aValue( diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index e0134088e7f1..37ef3ca2da00 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -89,7 +89,7 @@ ControlElement::ControlElement( OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : ElementBase( pImport->XMLNS_DIALOGS_UID, rLocalName, xAttributes, pParent, pImport ) { @@ -1880,7 +1880,7 @@ ElementBase::ElementBase( sal_Int32 nUid, OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : _pImport( pImport ) , _pParent( pParent ) , _nUid( nUid ) @@ -1896,7 +1896,7 @@ ElementBase::ElementBase( } //__________________________________________________________________________________________________ ElementBase::~ElementBase() - SAL_THROW( () ) + SAL_THROW(()) { _pImport->release(); @@ -1974,7 +1974,7 @@ Reference< xml::input::XElement > DialogImport::startRootElement( } //__________________________________________________________________________________________________ DialogImport::~DialogImport() - SAL_THROW( () ) + SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 OSL_TRACE( "DialogImport::~DialogImport()." ); @@ -2005,7 +2005,7 @@ Reference< util::XNumberFormatsSupplier > const & DialogImport::getNumberFormats void DialogImport::addStyle( OUString const & rStyleId, Reference< xml::input::XElement > const & xStyle ) - SAL_THROW( () ) + SAL_THROW(()) { (*_pStyleNames).push_back( rStyleId ); (*_pStyles).push_back( xStyle ); @@ -2013,7 +2013,7 @@ void DialogImport::addStyle( //__________________________________________________________________________________________________ Reference< xml::input::XElement > DialogImport::getStyle( OUString const & rStyleId ) const - SAL_THROW( () ) + SAL_THROW(()) { for ( size_t nPos = 0; nPos < (*_pStyleNames).size(); ++nPos ) { diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx index 2a1741afb2fc..616f31929530 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx @@ -529,7 +529,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& / Reference< XInterface > SAL_CALL create_XMLBasicExporter( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new XMLBasicExporter( xContext ) ); } @@ -538,7 +538,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& / Reference< XInterface > SAL_CALL create_XMLOasisBasicExporter( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new XMLOasisBasicExporter( xContext ) ); } diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx index 0f0af3b6295a..a5f26e2bbed0 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx @@ -909,7 +909,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x Reference< XInterface > SAL_CALL create_XMLBasicImporter( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new XMLBasicImporter( xContext ) ); } @@ -918,7 +918,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x Reference< XInterface > SAL_CALL create_XMLOasisBasicImporter( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new XMLOasisBasicImporter( xContext ) ); } diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx index 1cfa25525a3e..b8ca32156f3c 100644 --- a/xmlscript/source/xmllib_imexp/imp_share.hxx +++ b/xmlscript/source/xmllib_imexp/imp_share.hxx @@ -51,7 +51,7 @@ using namespace ::com::sun::star::uno; namespace xmlscript { -inline sal_Int32 toInt32( OUString const & rStr ) SAL_THROW( () ) +inline sal_Int32 toInt32( OUString const & rStr ) SAL_THROW(()) { sal_Int32 nVal; if (rStr.getLength() > 2 && rStr[ 0 ] == '0' && rStr[ 1 ] == 'x') @@ -135,16 +135,16 @@ struct LibraryImport public: inline LibraryImport( LibDescriptorArray* pLibArray ) - SAL_THROW( () ) + SAL_THROW(()) : mpLibArray( pLibArray ) , mpLibDesc( NULL ) {} // Single library mode inline LibraryImport( LibDescriptor* pLibDesc ) - SAL_THROW( () ) + SAL_THROW(()) : mpLibArray( NULL ) , mpLibDesc( pLibDesc ) {} virtual ~LibraryImport() - SAL_THROW( () ); + SAL_THROW(()); // XRoot virtual void SAL_CALL startDocument( @@ -180,9 +180,9 @@ public: OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes, LibElementBase * pParent, LibraryImport * pImport ) - SAL_THROW( () ); + SAL_THROW(()); virtual ~LibElementBase() - SAL_THROW( () ); + SAL_THROW(()); // XElement virtual Reference< xml::input::XElement > SAL_CALL getParent() @@ -230,7 +230,7 @@ public: OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes, LibElementBase * pParent, LibraryImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : LibElementBase( rLocalName, xAttributes, pParent, pImport ) {} }; @@ -255,7 +255,7 @@ public: OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes, LibElementBase * pParent, LibraryImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : LibElementBase( rLocalName, xAttributes, pParent, pImport ) {} }; diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx index f0d44b674204..158ca9959180 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx @@ -106,7 +106,7 @@ LibElementBase::LibElementBase( OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes, LibElementBase * pParent, LibraryImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : _pImport( pImport ) , _pParent( pParent ) , _aLocalName( rLocalName ) @@ -121,7 +121,7 @@ LibElementBase::LibElementBase( } //__________________________________________________________________________________________________ LibElementBase::~LibElementBase() - SAL_THROW( () ) + SAL_THROW(()) { _pImport->release(); @@ -214,7 +214,7 @@ Reference< xml::input::XElement > LibraryImport::startRootElement( } //__________________________________________________________________________________________________ LibraryImport::~LibraryImport() - SAL_THROW( () ) + SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 OSL_TRACE( "LibraryImport::~LibraryImport()." ); diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx index 3e63aa7a4e3e..1ae18d80b572 100644 --- a/xmlscript/source/xmlmod_imexp/imp_share.hxx +++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx @@ -70,10 +70,10 @@ struct ModuleImport public: inline ModuleImport( ModuleDescriptor& rModuleDesc ) - SAL_THROW( () ) + SAL_THROW(()) : mrModuleDesc( rModuleDesc ) {} virtual ~ModuleImport() - SAL_THROW( () ); + SAL_THROW(()); // XRoot virtual void SAL_CALL startDocument( @@ -110,9 +110,9 @@ public: OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes, ModuleElement * pParent, ModuleImport * pImport ) - SAL_THROW( () ); + SAL_THROW(()); virtual ~ModuleElement() - SAL_THROW( () ); + SAL_THROW(()); // XElement virtual Reference< xml::input::XElement > SAL_CALL getParent() diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index 2cbab0f7bc1e..ac358681e6cd 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -106,7 +106,7 @@ ModuleElement::ModuleElement( OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes, ModuleElement * pParent, ModuleImport * pImport ) - SAL_THROW( () ) + SAL_THROW(()) : _pImport( pImport ) , _pParent( pParent ) , _aLocalName( rLocalName ) @@ -121,7 +121,7 @@ ModuleElement::ModuleElement( } //__________________________________________________________________________________________________ ModuleElement::~ModuleElement() - SAL_THROW( () ) + SAL_THROW(()) { _pImport->release(); @@ -208,7 +208,7 @@ Reference< xml::input::XElement > ModuleImport::startRootElement( } //__________________________________________________________________________________________________ ModuleImport::~ModuleImport() - SAL_THROW( () ) + SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 OSL_TRACE( "ModuleImport::~ModuleImport()." ); |