You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by se...@apache.org on 2011/10/30 02:04:38 UTC
svn commit: r1195079 - in /poi/trunk: src/documentation/content/xdocs/
src/scratchpad/src/org/apache/poi/hwpf/model/
src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/ test-data/document/
Author: sergey
Date: Sun Oct 30 00:04:38 2011
New Revision: 1195079
URL: http://svn.apache.org/viewvc?rev=1195079&view=rev
Log:
fix 51944 - PAPFormattedDiskPage.getPAPX - IndexOutOfBounds
Added:
poi/trunk/test-data/document/Bug51944.doc (with props)
Modified:
poi/trunk/src/documentation/content/xdocs/status.xml
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
Modified: poi/trunk/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/status.xml?rev=1195079&r1=1195078&r2=1195079&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/status.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/status.xml Sun Oct 30 00:04:38 2011
@@ -34,6 +34,7 @@
<changes>
<release version="3.8-beta5" date="2011-??-??">
+ <action dev="poi-developers" type="fix">51944 - PAPFormattedDiskPage.getPAPX - IndexOutOfBounds</action>
<action dev="poi-developers" type="fix">52032 - HWPF - ArrayIndexOutofBoundsException with no stack trace (broken after revision 1178063)</action>
<action dev="poi-developers" type="add">support for converting pptx files into images with a PPTX2PNG tool</action>
<action dev="poi-developers" type="add">52050 - Support for the Excel RATE function</action>
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java?rev=1195079&r1=1195078&r2=1195079&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java Sun Oct 30 00:04:38 2011
@@ -59,14 +59,11 @@ public final class OldCHPBinTable extend
CHPFormattedDiskPage cfkp = new CHPFormattedDiskPage(documentStream,
pageOffset, tpt);
- int fkpSize = cfkp.size();
-
- for (int y = 0; y < fkpSize; y++)
- {
- CHPX chpx = cfkp.getCHPX(y);
- if (chpx != null)
- _textRuns.add(chpx);
- }
+ for ( CHPX chpx : cfkp.getCHPXs() )
+ {
+ if ( chpx != null )
+ _textRuns.add( chpx );
+ }
}
Collections.sort( _textRuns, PropertyNode.StartComparator.instance );
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java?rev=1195079&r1=1195078&r2=1195079&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java Sun Oct 30 00:04:38 2011
@@ -51,15 +51,11 @@ public final class OldPAPBinTable extend
PAPFormattedDiskPage pfkp = new PAPFormattedDiskPage(documentStream,
documentStream, pageOffset, tpt);
- int fkpSize = pfkp.size();
-
- for (int y = 0; y < fkpSize; y++)
- {
- PAPX papx = pfkp.getPAPX(y);
- if (papx != null) {
- _paragraphs.add(papx);
- }
- }
+ for ( PAPX papx : pfkp.getPAPXs() )
+ {
+ if ( papx != null )
+ _paragraphs.add( papx );
+ }
}
Collections.sort( _paragraphs, PropertyNode.StartComparator.instance );
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java?rev=1195079&r1=1195078&r2=1195079&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java Sun Oct 30 00:04:38 2011
@@ -721,6 +721,14 @@ public class TestBugs extends TestCase
}
/**
+ * Bug 51944 - PAPFormattedDiskPage.getPAPX - IndexOutOfBounds
+ */
+ public void testBug51944() throws Exception
+ {
+ HWPFTestDataSamples.openOldSampleFile( "Bug51944.doc" );
+ }
+
+ /**
* Bug 52032 - [BUG] & [partial-PATCH] HWPF - ArrayIndexOutofBoundsException
* with no stack trace (broken after revision 1178063)
*/
Added: poi/trunk/test-data/document/Bug51944.doc
URL: http://svn.apache.org/viewvc/poi/trunk/test-data/document/Bug51944.doc?rev=1195079&view=auto
==============================================================================
Binary file - no diff available.
Propchange: poi/trunk/test-data/document/Bug51944.doc
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org