diff options
| author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:45:16 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:45:16 +0000 |
| commit | 548b5c543a597df7dfd295016389078a04cc4a47 (patch) | |
| tree | 255a69eda803c6049fd20ef85a093a5554428854 /bridges | |
| parent | fbced203b787c06ce59fe834be683023e80731a9 (diff) | |
INTEGRATION: CWS ooo20040329 (1.6.152); FILE MERGED
2004/03/17 10:21:09 waratah 1.6.152.1: #i1858# alter the order of some definitions to fix some -Wall warnings
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/remote/urp/urp_job.hxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/bridges/source/remote/urp/urp_job.hxx b/bridges/source/remote/urp/urp_job.hxx index d78b10f391fc..fb2bd6ddf404 100644 --- a/bridges/source/remote/urp/urp_job.hxx +++ b/bridges/source/remote/urp/urp_job.hxx @@ -2,9 +2,9 @@ * * $RCSfile: urp_job.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: jbu $ $Date: 2001-05-14 09:57:58 $ + * last change: $Author: svesik $ $Date: 2004-04-21 13:45:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,6 @@ #include <uno/any2.h> #include <uno/environment.h> #include <uno/threadpool.h> - #include "urp_threadid.hxx" #include "urp_unmarshal.hxx" #include "urp_bridgeimpl.hxx" @@ -96,9 +95,9 @@ public: Job( uno_Environment *pEnvRemote, struct urp_BridgeImpl *pBridgeImpl, ::bridges_remote::RemoteThreadCounter_HoldEnvWeak value ) - : m_counter( pEnvRemote , value ) - , m_pBridgeImpl( pBridgeImpl ) + : m_pBridgeImpl( pBridgeImpl ) , m_pTid( 0 ) + , m_counter( pEnvRemote , value ) {} ~Job(); @@ -318,14 +317,14 @@ inline ClientJob::ClientJob( void *ppArgs[], uno_Any **ppException ) : Job( pEnvRemote , pBridgeImpl, ::bridges_remote::RTC_HOLDENVWEAK ) - , m_pOid( pOid ) // weak - , m_pEnvRemote( pEnvRemote ) // weak , m_ppArgs( ppArgs ) , m_pReturn( pReturn ) - , m_ppException( ppException ) , m_pInterfaceType( pInterfaceType ) // weak , m_bReleaseForTypeDescriptionNecessary( sal_False ) + , m_ppException( ppException ) , m_bBridgePropertyCall( sal_False ) + , m_pEnvRemote( pEnvRemote ) // weak + , m_pOid( pOid ) // weak , m_bCallingConventionForced( sal_False ) { uno_getIdOfCurrentThread( &m_pTid ); |