svn commit: r1705364 - in /openoffice/trunk/main/sw/source/filter/ww8: dump/ww8scan.cxx ww8scan.cxx

[pescetti]

Author: pescetti
Date: Fri Sep 25 22:15:38 2015
New Revision: 1705364

URL: http://svn.apache.org/viewvc?rev=1705364&view=rev
Log:
#i126558# Fix size of graphic objects in Word filter.
Patch by: Damjan Jovanovic <dam...@apache.org>

Modified:
    openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.cxx
    openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx

Modified: openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.cxx?rev=1705364&r1=1705363&r2=1705364&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.cxx Fri Sep 25 
22:15:38 2015
@@ -1548,7 +1548,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTab
        sal_uInt8 clxt;
 
        pStr->Seek( nClxPos );
-       while( 1 ) // Zaehle Zahl der Grpprls
+       while( nGrpprl < SAL_MAX_INT16 ) // Zaehle Zahl der Grpprls
     {
                *pStr >> clxt;
                nLeft--;
@@ -1563,6 +1563,8 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTab
                        return 0;                                               
        // schiefgegangen
                pStr->SeekRel( nLen );                                  // 
ueberlies grpprl
        }
+    if ( nGrpprl == SAL_MAX_INT16 )
+        return 0;
        pStr->Seek( nClxPos );
        nLeft = nClxLen;
        pPieceGrpprls = new sal_uInt8*[nGrpprl + 1];

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx?rev=1705364&r1=1705363&r2=1705364&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx Fri Sep 25 22:15:38 
2015
@@ -1651,7 +1651,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTab
     sal_uInt8 clxt;
 
     pStr->Seek( nClxPos );
-    while( 1 ) // Zaehle Zahl der Grpprls
+    while( nGrpprl < SAL_MAX_INT16 ) // Zaehle Zahl der Grpprls
     {
         *pStr >> clxt;
         nLeft--;
@@ -1666,6 +1666,8 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTab
             return 0;                           // schiefgegangen
         pStr->SeekRel( nLen );                  // ueberlies grpprl
     }
+    if ( nGrpprl == SAL_MAX_INT16 )
+        return 0;
     pStr->Seek( nClxPos );
     nLeft = nClxLen;
     pPieceGrpprls = new sal_uInt8*[nGrpprl + 1];