diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-19 16:50:50 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-19 16:52:03 +0200 |
| commit | e8ff469da51904a2ddafd59b2dcf45539370e08e (patch) | |
| tree | bf35796d9eca312ec3f06bbaa67abc70cdc42393 /bridges | |
| parent | eeaa2ecd1e1f6e0f468854b891de0caa28c470e6 (diff) | |
Remove any remaining remnants of unused component_canUnload feature
Change-Id: I635fd006b5ba9f5fb0091748ee2ff9bc3c1a2d2a
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/inc/bridges/cpp_uno/bridge.hxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx index 3e8eca450f3e..15d8eb896eec 100644 --- a/bridges/inc/bridges/cpp_uno/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/bridge.hxx @@ -281,8 +281,6 @@ inline cppu_Bridge::cppu_Bridge( , pUnoEnv( pUnoEnv_ ) , bExportCpp2Uno( bExportCpp2Uno_ ) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); - aCpp2Uno.pBridge = this; aCpp2Uno.acquire = cppu_Mapping_acquire; aCpp2Uno.release = cppu_Mapping_release; @@ -301,7 +299,6 @@ 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(()) @@ -472,16 +469,12 @@ inline void SAL_CALL cppu_cppenv_releaseInterface( uno_ExtEnvironment *, void * reinterpret_cast< ::com::sun::star::uno::XInterface * >( pCppI )->release(); } //-------------------------------------------------------------------------------------------------- -inline void SAL_CALL cppu_cppenv_environmentDisposing( uno_Environment * ) SAL_THROW(()) -{ - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); -} +inline void SAL_CALL cppu_cppenv_environmentDisposing( uno_Environment * ) 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!" ); - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); ((uno_ExtEnvironment *)pCppEnv)->computeObjectIdentifier = cppu_cppenv_computeObjectIdentifier; ((uno_ExtEnvironment *)pCppEnv)->acquireInterface = cppu_cppenv_acquireInterface; ((uno_ExtEnvironment *)pCppEnv)->releaseInterface = cppu_cppenv_releaseInterface; |