diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 12:58:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 12:58:11 +0000 |
| commit | 0346575a9cca9c671f49f204dfb17d49c54f7e66 (patch) | |
| tree | cab24a2a39fd1403b60c16b1d7ffc4647b50e89c /automation | |
| parent | d93113ae3bd6cc3479e8d9cf43189dabeec69de7 (diff) | |
INTEGRATION: CWS sixtyfour05 (1.4.30); FILE MERGED
2006/04/13 10:31:52 cmc 1.4.30.1: #i63183# automation 64bit fixes
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/source/server/retstrm.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx index 3e24a0580f11..c6c4b747804e 100644 --- a/automation/source/server/retstrm.cxx +++ b/automation/source/server/retstrm.cxx @@ -4,9 +4,9 @@ * * $RCSfile: retstrm.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:25:12 $ + * last change: $Author: hr $ $Date: 2006-04-19 13:58:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -74,17 +74,17 @@ void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue ) Write(aValue); } -void RetStream::GenReturn ( USHORT nRet, SmartId aUId, ULONG nNr, String aString, BOOL bBool ) +void RetStream::GenReturn ( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool ) { CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool ); } -void RetStream::GenReturn( USHORT nRet, SmartId aUId, USHORT nMethod, String aString ) +void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString ) { CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString ); } -void RetStream::GenReturn( USHORT nRet, SmartId aUId, USHORT nMethod, String aString, BOOL bBool ) +void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool ) { CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString, bBool ); } @@ -110,7 +110,7 @@ void RetStream::Write( SmartId* pId ) Write( &aTmp ); } else - Write( pId->GetNum() ); + Write( static_cast<comm_ULONG>(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit } |