Author: orw Date: Wed Aug 28 13:01:56 2013 New Revision: 1518191 URL: http://svn.apache.org/r1518191 Log: 123108: 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=1518191&r1=1518190&r2=1518191&view=diff ============================================================================== --- openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx (original) +++ openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx Wed Aug 28 13:01:56 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;