diff options
| author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:45:34 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:45:34 +0000 |
| commit | a0393be651d06de023444357a22d8bba6e73138a (patch) | |
| tree | 6ae793345863022516c27bd4a3d4b74f6ac6f8e5 /bridges | |
| parent | 548b5c543a597df7dfd295016389078a04cc4a47 (diff) | |
INTEGRATION: CWS ooo20040329 (1.3.142); FILE MERGED
2004/03/17 11:21:53 waratah 1.3.142.1: #i1858# alter the order of some definitions to fix some -Wall warnings
Remove an obvious declaration where just a use was needed
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/remote/urp/urp_marshal.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bridges/source/remote/urp/urp_marshal.cxx b/bridges/source/remote/urp/urp_marshal.cxx index 188f8d47fe71..24142b64b0ed 100644 --- a/bridges/source/remote/urp/urp_marshal.cxx +++ b/bridges/source/remote/urp/urp_marshal.cxx @@ -2,9 +2,9 @@ * * $RCSfile: urp_marshal.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jbu $ $Date: 2001-08-31 16:16:52 $ + * last change: $Author: svesik $ $Date: 2004-04-21 13:45:34 $ * * 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 <osl/diagnose.h> - #include <rtl/alloc.h> #include <uno/any2.h> @@ -80,11 +79,11 @@ char g_bMarshalSystemIsLittleEndian = ((char*)&g_nDetectLittleEndian)[0]; Marshal::Marshal( urp_BridgeImpl *pBridgeImpl, sal_Int32 nBufferSize, urp_extractOidCallback callback) : - m_callback( callback ), m_nBufferSize( nBufferSize ), m_base( (sal_Int8*)rtl_allocateMemory( nBufferSize ) ), m_pos( m_base + 2*sizeof( sal_Int32 ) ), - m_pBridgeImpl( pBridgeImpl ) + m_pBridgeImpl( pBridgeImpl ), + m_callback( callback ) {} Marshal::~Marshal( ) @@ -112,7 +111,7 @@ void Marshal::packOid( const ::rtl::OUString & oid ) else { // null reference - sal_uInt16 nIndex = 0xffff; + nIndex = 0xffff; OUString dummy; packString( &dummy ); } |