diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:30:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:30:13 +0000 |
| commit | c38aab3e60a3406a4c91dfd83c27f944421a76c8 (patch) | |
| tree | 0b35b16aa95cbedf8a8111b78502ba577ad81f2d /stoc | |
| parent | 58307b9539e5f81aa930c20c56e6908950e1e82b (diff) | |
INTEGRATION: CWS dba22 (1.8.32); FILE MERGED
2004/12/16 13:28:19 dbo 1.8.32.1: #i39037# oid corresponds to delegator
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/proxy_factory/proxyfac.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 50c662dbbd18..c642c59be752 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -2,9 +2,9 @@ * * $RCSfile: proxyfac.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2004-06-04 02:31:24 $ + * last change: $Author: kz $ $Date: 2005-01-21 17:30:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -380,11 +380,11 @@ Any ProxyRoot::queryAggregation( Type const & rType ) uno_ExtEnvironment * cpp_env = m_factory->m_cpp_env.get()->pExtEnv; OSL_ASSERT( cpp_env != 0 ); + // mind a new delegator, calculate current root: + Reference< XInterface > xRoot( + static_cast< OWeakObject * >(this), UNO_QUERY_THROW ); OUString oid; - (*cpp_env->getObjectIdentifier)( - cpp_env, &oid.pData, - static_cast< XInterface * >( - static_cast< ::cppu::OWeakObject * >(this) ) ); + (*cpp_env->getObjectIdentifier)( cpp_env, &oid.pData, xRoot.get() ); OSL_ASSERT( oid.getLength() > 0 ); (*cpp_env->getRegisteredInterface)( @@ -401,8 +401,6 @@ Any ProxyRoot::queryAggregation( Type const & rType ) if (proxy_target.is()) { // ensure root's object entries: - Reference< XInterface > xRoot( - static_cast< OWeakObject * >(this), UNO_QUERY_THROW ); UnoInterfaceReference root; m_factory->m_cpp2uno.mapInterface( reinterpret_cast< void ** >( &root.m_pUnoI ), |