diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-10-06 12:15:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-10-06 12:15:01 +0000 |
| commit | 4268d2cd61df88203dba03c9cacb2d1fb7567e82 (patch) | |
| tree | 094f4d5ac256f545a74c6985008eec9aa2745d55 /bridges/inc | |
| parent | 16881e19f36a6d36d4932d9265be0ba930fd2bc0 (diff) | |
INTEGRATION: CWS unopkg (1.12.40); FILE MERGED
2003/09/26 12:57:57 dbo 1.12.40.1: #112449# fixing msci bridge rethrow
Diffstat (limited to 'bridges/inc')
| -rw-r--r-- | bridges/inc/bridges/cpp_uno/bridge.hxx | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx index 4641b88a23ae..19f8cc1e9d92 100644 --- a/bridges/inc/bridges/cpp_uno/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/bridge.hxx @@ -2,9 +2,9 @@ * * $RCSfile: bridge.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:23:08 $ + * last change: $Author: vg $ $Date: 2003-10-06 13:15:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -329,25 +329,26 @@ inline void SAL_CALL cppu_Mapping_release( uno_Mapping * pMapping ) SAL_THROW( ( static_cast< cppu_Mapping * >( pMapping )->pBridge->release(); } //__________________________________________________________________________________________________ -inline cppu_Mapping::cppu_Mapping( cppu_Bridge * pBridge_, uno_MapInterfaceFunc fpMap ) SAL_THROW( () ) - : pBridge( pBridge_ ) -{ - uno_Mapping::acquire = cppu_Mapping_acquire; - uno_Mapping::release = cppu_Mapping_release; - uno_Mapping::mapInterface = fpMap; -} -//__________________________________________________________________________________________________ inline cppu_Bridge::cppu_Bridge( uno_ExtEnvironment * pCppEnv_, uno_ExtEnvironment * pUnoEnv_, sal_Bool bExportCpp2Uno_ ) SAL_THROW( () ) : nRef( 1 ) , pCppEnv( pCppEnv_ ) , pUnoEnv( pUnoEnv_ ) - , aCpp2Uno( this, cppu_Mapping_cpp2uno ) - , aUno2Cpp( this, cppu_Mapping_uno2cpp ) , bExportCpp2Uno( bExportCpp2Uno_ ) { g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); + + aCpp2Uno.pBridge = this; + aCpp2Uno.acquire = cppu_Mapping_acquire; + aCpp2Uno.release = cppu_Mapping_release; + aCpp2Uno.mapInterface = cppu_Mapping_cpp2uno; + + aUno2Cpp.pBridge = this; + aUno2Cpp.acquire = cppu_Mapping_acquire; + aUno2Cpp.release = cppu_Mapping_release; + aUno2Cpp.mapInterface = cppu_Mapping_uno2cpp; + (*((uno_Environment *)pCppEnv)->acquire)( (uno_Environment *)pCppEnv ); (*((uno_Environment *)pUnoEnv)->acquire)( (uno_Environment *)pUnoEnv ); } |