[Libreoffice-commits] core.git: sfx2/source sot/source starmath/source

[Noel Grandin (via logerrit)]

 sfx2/source/doc/graphhelp.cxx    |    2 +-
 sot/source/sdstor/stgstrms.cxx   |    4 ++--
 sot/source/sdstor/ucbstorage.cxx |    4 ++--
 starmath/source/mathtype.cxx     |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit da54fbce1c9101925059b980a0d9fe441bf0461f
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Aug 9 16:38:55 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Aug 9 20:06:54 2023 +0200

    use sal_uInt64 when dealing with stream position
    
    Change-Id: I2869e115941b3e1f52911d58d54ec1b2831d0524
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155524
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 754d5692f8c7..7cfdf76fe60f 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -116,7 +116,7 @@ void* GraphicHelper::getWinMetaFileFromGDI_Impl( const 
GDIMetaFile* pGDIMeta, co
         pStream.Flush();
         if ( !nFailed )
         {
-            sal_Int32 nLength = pStream.TellEnd();
+            sal_uInt64 nLength = pStream.TellEnd();
             if ( nLength > 22 )
             {
                 HMETAFILE hMeta = SetMetaFileBitsEx( nLength - 22,
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index b58c2a7922d9..61682ead8ab0 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -1300,8 +1300,8 @@ std::size_t StgTmpStrm::GetData( void* pData, std::size_t 
n )
 
 std::size_t StgTmpStrm::PutData( const void* pData, std::size_t n )
 {
-    sal_uInt32 nCur = Tell();
-    sal_uInt32 nNew = nCur + n;
+    sal_uInt64 nCur = Tell();
+    sal_uInt64 nNew = nCur + n;
     if( nNew > THRESHOLD && !m_pStrm )
     {
         SetSize( nNew );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 8ded02a7b139..fa203acc1178 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -253,9 +253,9 @@ sal_Int64 SAL_CALL FileStreamWrapper_Impl::getPosition(  )
     std::scoped_lock aGuard( m_aMutex );
     checkConnected();
 
-    sal_uInt32 nPos = m_pSvStream->Tell();
+    sal_uInt64 nPos = m_pSvStream->Tell();
     checkError();
-    return static_cast<sal_Int64>(nPos);
+    return nPos;
 }
 
 
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 56a666b969f3..aca49f034ad0 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1915,7 +1915,7 @@ bool MathType::ConvertFromStarMath( SfxMedium& rMedium )
         pS->WriteUChar( 0x01 );
         pS->WriteUChar( 0x03 );
         pS->WriteUChar( 0x00 );
-        sal_uInt32 nSize = pS->Tell();
+        sal_uInt64 nSize = pS->Tell();
         nPendingAttributes=0;
 
         HandleNodes(pTree, 0);