tools: support 64-bit file positions in SvStream

Bump stream positions to 64 bits on:

SvLockBytes::SetSize()
SvStream::SeekPos()
SvStream::SetSize()
SvStream::SetStreamSize()
SvStream::Seek()
SvStream::SeekRel()
SvStream::Tell()
SvStream::remainingSize()
SvStream::nActPos
SvStream::nBufFilePos

Change-Id: I0521fd60d31d1a33e5634cbf51dd42edc46ad919
TODO: adapt callers of Seek()/SeekRel()/Tell()/remainingSize()

4 files changed, 18 insertions, 18 deletions

diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 301899d0d0ae..0b9d0b564d2d 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -68,7 +68,7 @@ sal_uLong StgInternalStream::PutData( const void* pData, sal_uLong nSize )
         return 0;
 }
 
-sal_uLong StgInternalStream::SeekPos( sal_uLong nPos )
+sal_uInt64 StgInternalStream::SeekPos(sal_uInt64 const nPos)
 {
     return pStrm ? pStrm->Seek( nPos ) : 0;
 }
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index f1d1fa22110a..680daf26afbd 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -1187,7 +1187,7 @@ sal_uLong StgTmpStrm::GetSize() const
     return n;
 }
 
-void StgTmpStrm::SetSize( sal_uLong n )
+void StgTmpStrm::SetSize(sal_uInt64 n)
 {
     if( pStrm )
         pStrm->SetStreamSize( n );
@@ -1241,7 +1241,7 @@ void StgTmpStrm::SetSize( sal_uLong n )
         {
             if( n > nEndOfData )
             {
-                sal_uLong nCur = Tell();
+                sal_uInt64 nCur = Tell();
                 Seek( nEndOfData - 1 );
                 WriteUChar( (sal_uInt8) 0 );
                 Seek( nCur );
@@ -1284,7 +1284,7 @@ sal_uLong StgTmpStrm::PutData( const void* pData, sal_uLong n )
     return nNew;
 }
 
-sal_uLong StgTmpStrm::SeekPos( sal_uLong n )
+sal_uInt64 StgTmpStrm::SeekPos(sal_uInt64 n)
 {
     if( n == STREAM_SEEK_TO_END )
         n = GetSize();
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 5f18003b104a..217df328ee83 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -160,7 +160,7 @@ sal_uLong SotStorageStream::PutData( const void* pData, sal_uLong nSize )
     return nRet;
 }
 
-sal_uLong SotStorageStream::SeekPos( sal_uLong nPos )
+sal_uInt64 SotStorageStream::SeekPos(sal_uInt64 nPos)
 {
     sal_uLong nRet = 0;
 
@@ -186,9 +186,9 @@ void SotStorageStream::FlushData()
         SvStream::FlushData();
 }
 
-void SotStorageStream::SetSize( sal_uLong nNewSize )
+void SotStorageStream::SetSize(sal_uInt64 const nNewSize)
 {
-    sal_uLong   nPos = Tell();
+    sal_uInt64 const nPos = Tell();
     if( pOwnStm )
     {
         pOwnStm->SetSize( nNewSize );
@@ -211,7 +211,7 @@ sal_uInt32 SotStorageStream::GetSize() const
     return nSize;
 }
 
-sal_Size SotStorageStream::remainingSize()
+sal_uInt64 SotStorageStream::remainingSize()
 {
     if (pOwnStm)
         return pOwnStm->GetSize() - Tell();
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 117c7322e3ee..a27239c50faf 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -407,8 +407,8 @@ public:
 
     virtual sal_uLong           GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE;
     virtual sal_uLong           PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
-    virtual sal_uLong           SeekPos( sal_uLong nPos ) SAL_OVERRIDE;
-    virtual void                SetSize( sal_uLong nSize ) SAL_OVERRIDE;
+    virtual sal_uInt64          SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE;
+    virtual void                SetSize( sal_uInt64 nSize ) SAL_OVERRIDE;
     virtual void                FlushData() SAL_OVERRIDE;
     virtual void                ResetError() SAL_OVERRIDE;
 
@@ -447,7 +447,7 @@ public:
     BaseStorage*                CreateStorage();// create an OLE Storage on the UCBStorageStream
     sal_uLong                   GetSize();
 
-    sal_uLong                   ReadSourceWriteTemporary( sal_uLong aLength ); // read aLength from source and copy to temporary,
+    sal_uInt64                   ReadSourceWriteTemporary( sal_uInt64 aLength ); // read aLength from source and copy to temporary,
                                                                            // no seeking is produced
     sal_uLong                   ReadSourceWriteTemporary();                // read source till the end and copy to temporary,
 
@@ -827,12 +827,12 @@ sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary()
 
 }
 
-sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary( sal_uLong aLength )
+sal_uInt64 UCBStorageStream_Impl::ReadSourceWriteTemporary(sal_uInt64 aLength)
 {
     // read aLength bite from the source stream and copy them to the current
     // position of the temporary stream
 
-    sal_uLong aResult = 0;
+    sal_uInt64 aResult = 0;
 
     if( m_bSourceRead )
     {
@@ -843,7 +843,7 @@ sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary( sal_uLong aLength )
 
             sal_uLong aReaded = 32000;
 
-            for( sal_uLong pInd = 0; pInd < aLength && aReaded == 32000 ; pInd += 32000 )
+            for (sal_uInt64 pInd = 0; pInd < aLength && aReaded == 32000 ; pInd += 32000)
             {
                 sal_uLong aToCopy = min( aLength - pInd, 32000 );
                 aReaded = m_rSource->readBytes( aData, aToCopy );
@@ -939,12 +939,12 @@ sal_uLong UCBStorageStream_Impl::PutData( const void* pData, sal_uLong nSize )
 
 }
 
-sal_uLong UCBStorageStream_Impl::SeekPos( sal_uLong nPos )
+sal_uInt64 UCBStorageStream_Impl::SeekPos(sal_uInt64 const nPos)
 {
     if( !Init() )
         return 0;
 
-    sal_uLong aResult;
+    sal_uInt64 aResult;
 
     if( nPos == STREAM_SEEK_TO_END )
     {
@@ -996,7 +996,7 @@ sal_uLong UCBStorageStream_Impl::SeekPos( sal_uLong nPos )
     return aResult;
 }
 
-void  UCBStorageStream_Impl::SetSize( sal_uLong nSize )
+void  UCBStorageStream_Impl::SetSize(sal_uInt64 const nSize)
 {
     if ( !(m_nMode & STREAM_WRITE) )
     {
@@ -1011,7 +1011,7 @@ void  UCBStorageStream_Impl::SetSize( sal_uLong nSize )
 
     if( m_bSourceRead )
     {
-        sal_uLong aPos = m_pStream->Tell();
+        sal_uInt64 const aPos = m_pStream->Tell();
         m_pStream->Seek( STREAM_SEEK_TO_END );
         if( m_pStream->Tell() < nSize )
             ReadSourceWriteTemporary( nSize - m_pStream->Tell() );