Kaydet (Commit) 356f4775 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

editeng: harmonized types related to Tell()/Seek()

Change-Id: If0484da58011abae23ad19cbc3b9cf7e2e654b4c
Reviewed-on: https://gerrit.libreoffice.org/8216Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
Tested-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst 44bdc8bb
...@@ -401,7 +401,7 @@ bool EditTextObject::Store( SvStream& rOStream ) const ...@@ -401,7 +401,7 @@ bool EditTextObject::Store( SvStream& rOStream ) const
EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool ) EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool )
{ {
sal_uLong nStartPos = rIStream.Tell(); sal_Size nStartPos = rIStream.Tell();
// First check what type of Object... // First check what type of Object...
sal_uInt16 nWhich; sal_uInt16 nWhich;
......
...@@ -64,7 +64,7 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo ...@@ -64,7 +64,7 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo
SvMemoryStream* pStream = ( nT == SOT_FORMATSTR_ID_EDITENGINE ) ? &GetStream() : &GetRTFStream(); SvMemoryStream* pStream = ( nT == SOT_FORMATSTR_ID_EDITENGINE ) ? &GetStream() : &GetRTFStream();
pStream->Seek( STREAM_SEEK_TO_END ); pStream->Seek( STREAM_SEEK_TO_END );
sal_uLong nLen = pStream->Tell(); sal_Size nLen = pStream->Tell();
pStream->Seek(0); pStream->Seek(0);
uno::Sequence< sal_Int8 > aSeq( nLen ); uno::Sequence< sal_Int8 > aSeq( nLen );
......
...@@ -124,7 +124,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) ...@@ -124,7 +124,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich )
{ {
// Safe Load with Test on empty Bitmap // Safe Load with Test on empty Bitmap
Bitmap aBmp; Bitmap aBmp;
const sal_uInt32 nOldPos = rStrm.Tell(); const sal_Size nOldPos = rStrm.Tell();
// Ignore Errorcode when reading Bitmap, // Ignore Errorcode when reading Bitmap,
// see comment in SvxBulletItem::Store() // see comment in SvxBulletItem::Store()
sal_Bool bOldError = rStrm.GetError() ? sal_True : sal_False; sal_Bool bOldError = rStrm.GetError() ? sal_True : sal_False;
...@@ -328,7 +328,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c ...@@ -328,7 +328,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
StoreFont( rStrm, aFont ); StoreFont( rStrm, aFont );
else else
{ {
sal_uLong _nStart = rStrm.Tell(); sal_Size _nStart = rStrm.Tell();
// Small preliminary estimate of the size ... // Small preliminary estimate of the size ...
sal_uInt16 nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1; sal_uInt16 nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1;
...@@ -339,7 +339,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c ...@@ -339,7 +339,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
WriteDIB(aBmp, rStrm, false, true); WriteDIB(aBmp, rStrm, false, true);
} }
sal_uLong nEnd = rStrm.Tell(); sal_Size nEnd = rStrm.Tell();
// Item can not write with an overhead more than 64K or SfxMultiRecord // Item can not write with an overhead more than 64K or SfxMultiRecord
// will crash. Then prefer to forego on the bitmap, it is only // will crash. Then prefer to forego on the bitmap, it is only
// important for the outliner and only for <= 5.0. // important for the outliner and only for <= 5.0.
......
...@@ -748,7 +748,7 @@ SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons ...@@ -748,7 +748,7 @@ SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons
{ {
rStrm.ReadUInt16( left ).ReadUInt16( prpleft ).ReadUInt16( right ).ReadUInt16( prpright ).ReadInt16( firstline ). ReadUInt16( prpfirstline ).ReadUInt16( txtleft ).ReadSChar( autofirst ); rStrm.ReadUInt16( left ).ReadUInt16( prpleft ).ReadUInt16( right ).ReadUInt16( prpright ).ReadInt16( firstline ). ReadUInt16( prpfirstline ).ReadUInt16( txtleft ).ReadSChar( autofirst );
sal_uInt32 nPos = rStrm.Tell(); sal_Size nPos = rStrm.Tell();
sal_uInt32 nMarker; sal_uInt32 nMarker;
rStrm.ReadUInt32( nMarker ); rStrm.ReadUInt32( nMarker );
if ( nMarker == BULLETLR_MARKER ) if ( nMarker == BULLETLR_MARKER )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment