[Libreoffice-commits] core.git: editeng/source

[Norbert Thiebaud]

 editeng/source/editeng/editobj.cxx |    2 +-
 editeng/source/editeng/eeobj.cxx   |    2 +-
 editeng/source/items/bulitem.cxx   |    6 +++---
 editeng/source/items/frmitems.cxx  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 356f47752d5ae2a7dba9dbb74642d117aadf1649
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Feb 24 21:04:19 2014 -0600

    editeng: harmonized types related to Tell()/Seek()
    
    Change-Id: If0484da58011abae23ad19cbc3b9cf7e2e654b4c
    Reviewed-on: https://gerrit.libreoffice.org/8216
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index cba107f..5ee30f1 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -401,7 +401,7 @@ bool EditTextObject::Store( SvStream& rOStream ) const
 
 EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool )
 {
-    sal_uLong nStartPos = rIStream.Tell();
+    sal_Size nStartPos = rIStream.Tell();
 
     // First check what type of Object...
     sal_uInt16 nWhich;
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index d6cc23e..0c833b0 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -64,7 +64,7 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo
 
         SvMemoryStream* pStream = ( nT == SOT_FORMATSTR_ID_EDITENGINE ) ? &GetStream() : &GetRTFStream();
         pStream->Seek( STREAM_SEEK_TO_END );
-        sal_uLong nLen = pStream->Tell();
+        sal_Size nLen = pStream->Tell();
         pStream->Seek(0);
 
         uno::Sequence< sal_Int8 > aSeq( nLen );
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index c2dfcbd..391b84e 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -124,7 +124,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich )
     {
         // Safe Load with Test on empty Bitmap
         Bitmap          aBmp;
-        const sal_uInt32    nOldPos = rStrm.Tell();
+        const sal_Size    nOldPos = rStrm.Tell();
         // Ignore Errorcode when reading Bitmap,
         // see comment in SvxBulletItem::Store()
         sal_Bool bOldError = rStrm.GetError() ? sal_True : sal_False;
@@ -328,7 +328,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
         StoreFont( rStrm, aFont );
     else
     {
-        sal_uLong _nStart = rStrm.Tell();
+        sal_Size _nStart = rStrm.Tell();
 
         // Small preliminary estimate of the size ...
         sal_uInt16 nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1;
@@ -339,7 +339,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
             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
         // will crash. Then prefer to forego on the bitmap, it is only
         // important for the outliner and only for <= 5.0.
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 23c1177..7eb2220 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -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 );
 
-        sal_uInt32 nPos = rStrm.Tell();
+        sal_Size nPos = rStrm.Tell();
         sal_uInt32 nMarker;
         rStrm.ReadUInt32( nMarker );
         if ( nMarker == BULLETLR_MARKER )