summaryrefslogtreecommitdiff
path: root/bridges/inc
diff options
context:
space:
mode:
authorAlexander Bergmann <myaddons@gmx.de>2012-01-26 16:00:09 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-01-26 17:41:07 +0000
commit0439af27e1f37b19d4409f34f974d6ade49f99bf (patch)
tree13bbb2549319d74a1a109bf2727aab37dca5b8c7 /bridges/inc
parentf1cb0a4ab4f11dc015be1696c7c7751802171915 (diff)
Code cleanup: ( () ) replaced by (())
Diffstat (limited to 'bridges/inc')
-rw-r--r--bridges/inc/bridges/cpp_uno/bridge.hxx48
-rw-r--r--bridges/inc/bridges/cpp_uno/type_misc.hxx6
2 files changed, 27 insertions, 27 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 );
}