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

Caolán McNamara caolanm at redhat.com
Thu Jan 12 20:59:47 UTC 2017


 filter/source/graphicfilter/ios2met/ios2met.cxx |   12 ------------
 1 file changed, 12 deletions(-)

New commits:
commit 80e261cec7a90272f8820a36cca4c751a90916f5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 12 20:58:21 2017 +0000

    ofz: this cluster of variables are unused
    
    but lead to a fpe on an empty filter
    
    Change-Id: Id76b365b5fcc866d214753dada80411fc33d2e5c

diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 6e09ee4..e5e5e6d 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2603,8 +2603,6 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize)
 
 void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaFile )
 {
-    sal_uLong nPercent, nLastPercent;
-
     ErrorCode=0;
 
     pOS2MET             = &rStreamOS2MET;
@@ -2667,20 +2665,10 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
 
     pOS2MET->SetEndian(SvStreamEndian::LITTLE);
 
-    sal_uInt64 const nStartPos = pOS2MET->Tell();
-    sal_uInt64 const nRemaining = pOS2MET->remainingSize();
-
-    nLastPercent=0;
-
     sal_uInt64 nPos = pOS2MET->Tell();
 
     for (;;) {
 
-        nPercent = (nPos-nStartPos)*100 / nRemaining;
-        if (nLastPercent+4<=nPercent) {
-            nLastPercent=nPercent;
-        }
-
         sal_uInt16 nFieldSize = ReadBigEndianWord();
         sal_uInt8 nMagicByte(0);
         pOS2MET->ReadUChar( nMagicByte );


More information about the Libreoffice-commits mailing list