From 553b72ac78a4d1f8c7531748a903c4a52355f2cd Mon Sep 17 00:00:00 2001 From: Keith McRae Date: Wed, 18 Jan 2012 16:00:22 +0000 Subject: fdo#39428 Remove/audit SvStream operator>>/<<(long) Changed case SbxSALINT64: to use operator>>(sal_Int64) --- basic/source/sbx/sbxvalue.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'basic') 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: -- cgit v1.2.3