diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 09:04:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 09:04:58 +0000 |
| commit | 3b2b8f91ff22b93050b9b1aa3da5bd4359182499 (patch) | |
| tree | 3e37aa664496da562640735b168da4dcc08bb737 /remotebridges | |
| parent | 257b3205cae2665a96492b806df10faf884a4e99 (diff) | |
CWS-TOOLING: integrate CWS sb93
Diffstat (limited to 'remotebridges')
| -rw-r--r-- | remotebridges/source/bridge/bridge_provider.cxx | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/remotebridges/source/bridge/bridge_provider.cxx b/remotebridges/source/bridge/bridge_provider.cxx index edac3dc38489..0e8016d88f3b 100644 --- a/remotebridges/source/bridge/bridge_provider.cxx +++ b/remotebridges/source/bridge/bridge_provider.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: bridge_provider.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -33,6 +33,7 @@ #include "remote_bridge.hxx" #include <osl/diagnose.h> +#include <rtl/ustrbuf.hxx> #include <uno/mapping.hxx> #include <uno/environment.h> @@ -125,18 +126,18 @@ namespace remotebridges_bridge *ppRemoteI = 0; } + OUString sCppuName( RTL_CONSTASCII_USTRINGPARAM( CPPU_CURRENT_LANGUAGE_BINDING_NAME ) ); + + uno_Environment *pEnvThis = 0; + uno_getEnvironment( &pEnvThis , + sCppuName.pData , + 0 ); + Mapping map( pEnvThis , pEnvRemote ); + pEnvThis->release( pEnvThis ); + if( OUString( pType->aBase.pTypeName ) == getCppuType( (Reference<XInterface>*)0).getTypeName() ) { - OUString sCppuName( RTL_CONSTASCII_USTRINGPARAM( CPPU_CURRENT_LANGUAGE_BINDING_NAME ) ); - - uno_Environment *pEnvThis = 0; - uno_getEnvironment( &pEnvThis , - sCppuName.pData , - 0 ); - Mapping map( pEnvThis , pEnvRemote ); - pEnvThis->release( pEnvThis ); - try { Reference< XInterface > r = m->m_rProvider->getInstance( @@ -167,5 +168,15 @@ namespace remotebridges_bridge } } + else + { + OUStringBuffer msg; + msg.appendAscii( + RTL_CONSTASCII_STRINGPARAM( + "getInstance expected XInterface but got ")); + msg.append(pType->aBase.pTypeName); + convertToRemoteRuntimeException( + ppException, msg.getStr(), Reference< XInterface >(), map); + } } } |