diff options
| author | Keith McRae <keithcoder@gmail.com> | 2012-01-18 16:00:22 +0000 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-18 22:56:13 -0500 |
| commit | 553b72ac78a4d1f8c7531748a903c4a52355f2cd (patch) | |
| tree | 6898dedcb38a49e68b9bc81844cdba7def97efc5 /basic | |
| parent | 2adad6a4b3e52b9d8365c4cb71525526b38035a9 (diff) | |
fdo#39428 Remove/audit SvStream operator>>/<<(long)
Changed case SbxSALINT64: to use operator>>(sal_Int64)
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index e1aa67de13f8..c6c95dc189cc 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1500,12 +1500,12 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) } break; } - case SbxSALUINT64: + //#fdo39428 SvStream no longer supports operator>>(long&) + //SvStream now has operator>>(sal_Int64&) case SbxSALINT64: - // Rather ugly use of the union here because we only - // have a SvStream& SvStream::operator>>(sal_uInt64&) available to us - // There is no SvStream::operator>>(sal_Int64&) due to conflict with - // SvStream::operator>>(long&) ( at least on 64 bit linux ) + r >> aData.nInt64; + break; + case SbxSALUINT64: r >> aData.uInt64; break; case SbxCURRENCY: |