diff options
| author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:45:02 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:45:02 +0000 |
| commit | fbced203b787c06ce59fe834be683023e80731a9 (patch) | |
| tree | 858f5b876128bd645e9e497d90d60b49ee167aba /bridges | |
| parent | 6e09abe491801734e9f6a04a63fe42413f436fd0 (diff) | |
INTEGRATION: CWS ooo20040329 (1.10.130); FILE MERGED
2004/04/08 01:52:29 svesik 1.10.130.2: RESYNC: (1.10-1.11); FILE MERGED
2004/03/17 10:21:09 waratah 1.10.130.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.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bridges/source/remote/urp/urp_job.cxx b/bridges/source/remote/urp/urp_job.cxx index e57c79726048..985539700c4e 100644 --- a/bridges/source/remote/urp/urp_job.cxx +++ b/bridges/source/remote/urp/urp_job.cxx @@ -2,9 +2,9 @@ * * $RCSfile: urp_job.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: kz $ $Date: 2004-03-25 14:57:32 $ + * last change: $Author: svesik $ $Date: 2004-04-21 13:45:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,6 @@ ************************************************************************/ #include <string.h> #include <stdio.h> - #include <osl/diagnose.h> #include <osl/mutex.hxx> @@ -136,10 +135,10 @@ namespace bridges_urp sal_Sequence *pTid, struct urp_BridgeImpl *pBridgeImpl, Unmarshal *pUnmarshal ) - : m_pTid( pTid ) - , m_counter( pEnvRemote ) + : m_pUnmarshal( pUnmarshal ) , m_pBridgeImpl( pBridgeImpl ) - , m_pUnmarshal( pUnmarshal ) + , m_pTid( pTid ) + , m_counter( pEnvRemote ) { if( m_pTid ) rtl_byte_sequence_acquire( pTid ); @@ -523,9 +522,9 @@ namespace bridges_urp sal_Int32 nMaxMessages ) : Job( pEnvRemote, pTid, pBridgeImpl , pUnmarshal ) , m_pEnvRemote( pEnvRemote ) - , m_nCurrentMemPosition( 0 ) , m_nCalls( 0 ) , m_nMaxMessages( nMaxMessages ) + , m_nCurrentMemPosition( 0 ) { m_pEnvRemote->acquire( m_pEnvRemote ); m_nCurrentMemSize = MULTIJOB_STANDARD_MEMORY_SIZE + m_nMaxMessages * ( |