openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1499266 - /openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx
Date Wed, 03 Jul 2013 08:45:56 GMT
Author: orw
Date: Wed Jul  3 08:45:55 2013
New Revision: 1499266

URL: http://svn.apache.org/r1499266
Log:
WW8 import: further adjustment to the validation check for PLCF position arrays

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

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=1499266&r1=1499265&r2=1499266&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx Wed Jul  3 08:45:55 2013
@@ -940,15 +940,17 @@ namespace {
     {
         bool bIsValid = true;
 
-        WW8_CP nValue = 0;
+        //WW8_CP nValue = 0;
         for ( sal_Int32 i = 0; i <= nMaxIndex; ++i )
         {
-            if ( pPLCFPosArray[i] != 0 && pPLCFPosArray[i] < nValue )
+            if ( pPLCFPosArray[i] < 0
+                 && !( i == nMaxIndex-1 && pPLCFPosArray[i] == -63488 ) 
 // pPLCFPosArray[nMaxIndex-1]==-63488 seems to be allowed
+                 && !( i == nMaxIndex-1 && pPLCFPosArray[i] == -65536 ) )
// pPLCFPosArray[nMaxIndex-1]==-65536 seems to be allowed
             {
                 bIsValid = false;
                 break;
             }
-            nValue = pPLCFPosArray[i];
+            //nValue = pPLCFPosArray[i];
         }
 
         return bIsValid;



Mime
View raw message