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

Eda Nur Var (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 28 07:38:37 UTC 2020


 svx/source/xml/xmlgrhlp.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2a37089bad8656271f0fde92ab7731f29a19c8df
Author:     Eda Nur Var <var.eda.nur at gmail.com>
AuthorDate: Mon Jan 27 03:03:21 2020 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Tue Jan 28 08:37:55 2020 +0100

    tdf#75280 Convert inappropriate use of sal_uIntPtr to better integer types
    
    Change-Id: I2829cccb526084590889d0618bc89a921aa8cdf7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87475
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index a75d159dd41d..71d515a8a7fe 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -305,10 +305,10 @@ Graphic SvXMLGraphicOutputStream::GetGraphic()
 
             sal_uInt8    sFirstBytes[ 2 ];
 
-            sal_uIntPtr nStreamLen = mpOStm->TellEnd();
+            sal_uInt64 nStreamLen = mpOStm->TellEnd();
             mpOStm->Seek( 0 );
 
-            if ( !nStreamLen )
+            if ( nStreamLen == 0 )
             {
                 SvLockBytes* pLockBytes = mpOStm->GetLockBytes();
                 if ( pLockBytes  )
@@ -332,8 +332,8 @@ Graphic SvXMLGraphicOutputStream::GetGraphic()
 
                     if (aZCodec.EndCompression())
                     {
-                        sal_uIntPtr nStreamLen_ = pDest->TellEnd();
-                        if (nStreamLen_)
+                        sal_uInt64 nStreamLen_ = pDest->TellEnd();
+                        if (nStreamLen_ > 0)
                         {
                             pDest->Seek(0);
                             GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, "", *pDest ,nFormat,&nDeterminedFormat );


More information about the Libreoffice-commits mailing list