diff options
| author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:43:44 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:43:44 +0000 |
| commit | 03efe9a213eb8616f3df0250b330087968f62260 (patch) | |
| tree | 421145472fa30553c250d0709a2cc86eb5fedf41 /bridges | |
| parent | c74aa42a316d66284136398081c8ce86a1650133 (diff) | |
INTEGRATION: CWS ooo20040329 (1.8.10); FILE MERGED
2004/03/17 11:04:16 waratah 1.8.10.1: #i1858# alter the order of some definitions to fix some -Wall warnings
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/remote/static/proxy.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bridges/source/remote/static/proxy.cxx b/bridges/source/remote/static/proxy.cxx index 827078919769..c79d710c3086 100644 --- a/bridges/source/remote/static/proxy.cxx +++ b/bridges/source/remote/static/proxy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: proxy.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2004-02-04 13:42:31 $ + * last change: $Author: svesik $ $Date: 2004-04-21 13:43:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,6 @@ #endif #include <assert.h> #include <sal/alloca.h> - #include <bridges/remote/proxy.hxx> #include <bridges/remote/context.h> @@ -327,14 +326,14 @@ Remote2UnoProxy::Remote2UnoProxy( remote_Interface *pRemoteI, typelib_InterfaceTypeDescription *pType, uno_Environment *pEnvUno, uno_Environment *pEnvRemote ) : + m_sOid( pOid ), m_pType( pType ), m_pRemoteI( pRemoteI ), m_pEnvUno( pEnvUno ), m_pEnvRemote( pEnvRemote ), - m_sOid( pOid ), - m_nRef( 1 ), m_mapRemote2Uno( pEnvRemote, pEnvUno ), - m_mapUno2Remote( pEnvUno , pEnvRemote ) + m_mapUno2Remote( pEnvUno , pEnvRemote ), + m_nRef( 1 ) { typelib_typedescription_acquire( (typelib_TypeDescription * ) m_pType ); m_pEnvUno->acquire( m_pEnvUno ); |