From 0439af27e1f37b19d4409f34f974d6ade49f99bf Mon Sep 17 00:00:00 2001 From: Alexander Bergmann Date: Thu, 26 Jan 2012 16:00:09 +0100 Subject: Code cleanup: ( () ) replaced by (()) --- bridges/inc/bridges/cpp_uno/bridge.hxx | 48 +++++++++++----------- bridges/inc/bridges/cpp_uno/type_misc.hxx | 6 +-- bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx | 14 +++---- bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 14 +++---- bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx | 14 +++---- bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 14 +++---- bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx | 14 +++---- bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx | 14 +++---- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 14 +++---- bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx | 14 +++---- bridges/source/cpp_uno/gcc3_linux_mips/except.cxx | 14 +++---- .../source/cpp_uno/gcc3_linux_powerpc/except.cxx | 14 +++---- .../source/cpp_uno/gcc3_linux_powerpc64/except.cxx | 14 +++---- bridges/source/cpp_uno/gcc3_linux_s390/except.cxx | 14 +++---- bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx | 14 +++---- bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx | 14 +++---- .../source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 2 +- .../source/cpp_uno/gcc3_linux_x86-64/except.cxx | 14 +++---- .../source/cpp_uno/gcc3_macosx_intel/except.cxx | 14 +++---- .../source/cpp_uno/gcc3_macosx_powerpc/except.cxx | 14 +++---- .../source/cpp_uno/gcc3_solaris_intel/except.cxx | 14 +++---- .../source/cpp_uno/gcc3_solaris_sparc/except.cxx | 14 +++---- bridges/source/cpp_uno/mingw_intel/except.cxx | 14 +++---- bridges/source/cpp_uno/shared/component.cxx | 16 ++++---- bridges/source/jni_uno/jni_base.h | 6 +-- bridges/source/jni_uno/jni_bridge.cxx | 6 +-- bridges/source/jni_uno/jni_bridge.h | 2 +- 27 files changed, 183 insertions(+), 183 deletions(-) (limited to 'bridges') 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 ); -- cgit