diff options
| -rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 3 | ||||
| -rw-r--r-- | include/tools/stream.hxx | 6 | ||||
| -rw-r--r-- | svl/source/items/dateitem.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 24 | ||||
| -rw-r--r-- | tools/source/stream/stream.cxx | 4 |
5 files changed, 27 insertions, 12 deletions
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index f0ea5d13d0f3..3efbdabbb375 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1449,9 +1449,8 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) break; } //#fdo39428 SvStream no longer supports operator>>(long&) - //SvStream now has operator>>(sal_Int64&) case SbxSALINT64: - r >> aData.nInt64; + r.ReadInt64(aData.nInt64); break; case SbxSALUINT64: r >> aData.uInt64; diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 78a0bc3df96f..7897d7f7efc4 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -307,7 +307,8 @@ public: SvStream& operator>>( sal_uInt64& rUInt64 ); SvStream& operator>>( sal_Int16& rInt16 ); SvStream& operator>>( sal_Int32& rInt32 ); - SvStream& operator>>( sal_Int64& rInt64 ); + SvStream& operator>>( sal_Int64& rInt64 ) SAL_DELETED_FUNCTION; + SvStream& ReadInt64(sal_Int64 & rInt64); SvStream& operator>>( signed char& rChar ); SvStream& operator>>( char& rChar ); @@ -321,7 +322,8 @@ public: SvStream& operator<<( sal_uInt64 nuInt64 ); SvStream& operator<<( sal_Int16 nInt16 ); SvStream& operator<<( sal_Int32 nInt32 ); - SvStream& operator<<( sal_Int64 nInt64 ); + SvStream& operator<<( sal_Int64 nInt64 ) SAL_DELETED_FUNCTION; + SvStream& WriteInt64(sal_Int64 nInt64); SvStream& operator<<( bool b ) { return operator<<(static_cast< sal_Bool >(b)); } diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx index 54e942e3757f..67ebba630cc9 100644 --- a/svl/source/items/dateitem.cxx +++ b/svl/source/items/dateitem.cxx @@ -102,7 +102,7 @@ SvStream& SfxDateTimeItem::Store( SvStream& rStream, sal_uInt16 ) const { DBG_CHKTHIS(SfxDateTimeItem, 0); rStream << aDateTime.GetDate(); - rStream << aDateTime.GetTime(); + rStream << static_cast<sal_Int32>(aDateTime.GetTime()); return rStream; } diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index cf5a03e6ffcb..06a290a10b4b 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -1196,16 +1196,30 @@ bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SvStream& SwFmtVertOrient::Store(SvStream &rStream, sal_uInt16 /*version*/) const { - rStream << nYPos << eOrient << eRelation; +#if SAL_TYPES_SIZEOFLONG == 8 + rStream.WriteInt64(nYPos); +#else + rStream << static_cast<sal_Int32>(nYPos); +#endif + rStream << eOrient << eRelation; return rStream; } SfxPoolItem* SwFmtVertOrient::Create(SvStream &rStream, sal_uInt16 /*itemVersion*/) const { - SwTwips yPos; - sal_Int16 orient; - sal_Int16 relation; - rStream >> yPos >> orient >> relation; + SwTwips yPos(0); + sal_Int16 orient(0); + sal_Int16 relation(0); + // compatibility hack for Table Auto Format: SwTwips is "long" :( + // (this means that the file format is platform dependent) +#if SAL_TYPES_SIZEOFLONG == 8 + rStream.ReadInt64(yPos); +#else + sal_Int32 n; + rStream >> n; + yPos = n; +#endif + rStream >> orient >> relation; return new SwFmtVertOrient(yPos, orient, relation); } diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index e80256652e40..f964e6e2a98a 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -962,7 +962,7 @@ SvStream& SvStream::operator>>(sal_Int32& r) return *this; } -SvStream& SvStream::operator>>(sal_Int64& r) +SvStream& SvStream::ReadInt64(sal_Int64& r) { sal_Int64 n = 0; READNUMBER_WITHOUT_SWAP(sal_Int64, n) @@ -1107,7 +1107,7 @@ SvStream& SvStream::operator<< ( sal_Int32 v ) return *this; } -SvStream& SvStream::operator<< ( sal_Int64 v ) +SvStream& SvStream::WriteInt64 (sal_Int64 v) { if( bSwap ) SwapInt64(v); |