svn commit: r1518667 - in /openoffice/branches/AOO401: ./ main/sw/source/filter/ww8/ww8scan.cxx

[orw]

Author: orw
Date: Thu Aug 29 14:58:20 2013
New Revision: 1518667

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

        cherry-picked from trunk


Modified:
    openoffice/branches/AOO401/   (props changed)
    openoffice/branches/AOO401/main/sw/source/filter/ww8/ww8scan.cxx

Propchange: openoffice/branches/AOO401/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1518191

Modified: openoffice/branches/AOO401/main/sw/source/filter/ww8/ww8scan.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO401/main/sw/source/filter/ww8/ww8scan.cxx?rev=1518667&r1=1518666&r2=1518667&view=diff
==============================================================================
--- openoffice/branches/AOO401/main/sw/source/filter/ww8/ww8scan.cxx (original)
+++ openoffice/branches/AOO401/main/sw/source/filter/ww8/ww8scan.cxx Thu Aug 29 
14:58:20 2013
@@ -944,8 +944,9 @@ namespace {
         for ( sal_Int32 i = 0; i <= nMaxIndex; ++i )
         {
             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
+                 && !( i == nMaxIndex-1 && pPLCFPosArray[i] == -63488 )   // 
pPLCFPosArray[nMaxIndex-1]==-63488 (0xffff0800) seems to be allowed
+                 && !( i == nMaxIndex-1 && pPLCFPosArray[i] == -65536 )   // 
pPLCFPosArray[nMaxIndex-1]==-65536 (0xffff0000) seems to be allowed
+                 && !( i == nMaxIndex-1 && pPLCFPosArray[i] == -61440 ) ) // 
pPLCFPosArray[nMaxIndex-1]==-61440 (0xffff112c) seems to be allowed
             {
                 bIsValid = false;
                 break;