diff options
Diffstat (limited to 'cppu/inc/uno')
-rw-r--r-- | cppu/inc/uno/current_context.hxx | 14 | ||||
-rw-r--r-- | cppu/inc/uno/environment.hxx | 62 | ||||
-rw-r--r-- | cppu/inc/uno/mapping.hxx | 68 |
3 files changed, 72 insertions, 72 deletions
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) ), |