diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-25 10:15:35 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-25 10:15:35 +0000 |
| commit | 2e3c43d9e93e32cb239080b4aebf8f5f51ae279f (patch) | |
| tree | 5b730e8f121b9344421bbee62f35f5327c325bfb /basic | |
| parent | 67f3cc6dc82e8e65b81071f9e322e9dbfac33f3a (diff) | |
INTEGRATION: CWS cmcfixes46 (1.9.22); FILE MERGED
2008/05/26 16:21:55 cmc 1.9.22.1: #i58385# fix up for 64bit
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/sbx/sbxvar.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 02768b55f984..66c56adc731a 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sbxvar.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -361,14 +361,18 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer ) if( !SbxValue::LoadData( rStrm, nVer ) ) return FALSE; rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US ); - rStrm >> nUserData; + UINT32 nTemp; + rStrm >> nTemp; + nUserData = nTemp; } else { rStrm.SeekRel( -1L ); rStrm >> nType; rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US ); - rStrm >> nUserData; + UINT32 nTemp; + rStrm >> nTemp; + nUserData = nTemp; // Korrektur: Alte Methoden haben statt SbxNULL jetzt SbxEMPTY if( nType == SbxNULL && GetClass() == SbxCLASS_METHOD ) nType = SbxEMPTY; @@ -473,7 +477,7 @@ BOOL SbxVariable::StoreData( SvStream& rStrm ) const // if( !SbxValue::StoreData( rStrm ) ) // return FALSE; rStrm.WriteByteString( maName, RTL_TEXTENCODING_ASCII_US ); - rStrm << nUserData; + rStrm << (UINT32)nUserData; if( pInfo.Is() ) { rStrm << (BYTE) 2; // Version 2: mit UserData! |