moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Patch from Trejkaz - fix bug #48038 - handle reading HWPF stylesheets from non zero offsets

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@832625 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2009-11-04 00:07:37 +00:00
parent 0880802d5d
commit a9d6f34732
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/documentation/content/xdocs/status.xml
View File

@ -34,6 +34,7 @@
<changes> <changes>
<release version="3.6-beta1" date="2009-??-??"> <release version="3.6-beta1" date="2009-??-??">
<action dev="POI-DEVELOPERS" type="fix">48038 - handle reading HWPF stylesheets from non zero offsets</action>
<action dev="POI-DEVELOPERS" type="add">When running the "compile-ooxml-xsds" ant task, also generate the source jar for the OOXML Schemas</action> <action dev="POI-DEVELOPERS" type="add">When running the "compile-ooxml-xsds" ant task, also generate the source jar for the OOXML Schemas</action>
<action dev="POI-DEVELOPERS" type="fix">45672 - improve handling by MissingRecordAwareHSSFListener of records that cover multiple cells (MulBlankRecord and MulRKRecord)</action> <action dev="POI-DEVELOPERS" type="fix">45672 - improve handling by MissingRecordAwareHSSFListener of records that cover multiple cells (MulBlankRecord and MulRKRecord)</action>
<action dev="POI-DEVELOPERS" type="fix">48096 - relaxed validation check in RecalcIdRecord</action> <action dev="POI-DEVELOPERS" type="fix">48096 - relaxed validation check in RecalcIdRecord</action>

3
src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java
View File

@ -65,6 +65,7 @@ public final class StyleSheet implements HDFType {
*/ */
public StyleSheet(byte[] tableStream, int offset) public StyleSheet(byte[] tableStream, int offset)
{ {
int startOffset = offset;
_stshiLength = LittleEndian.getShort(tableStream, offset); _stshiLength = LittleEndian.getShort(tableStream, offset);
offset += LittleEndian.SHORT_SIZE; offset += LittleEndian.SHORT_SIZE;
int stdCount = LittleEndian.getShort(tableStream, offset); int stdCount = LittleEndian.getShort(tableStream, offset);
@ -88,7 +89,7 @@ public final class StyleSheet implements HDFType {
_rgftc[2] = LittleEndian.getShort(tableStream, offset); _rgftc[2] = LittleEndian.getShort(tableStream, offset);
offset += LittleEndian.SHORT_SIZE; offset += LittleEndian.SHORT_SIZE;
offset = (LittleEndian.SHORT_SIZE + _stshiLength); offset = startOffset + LittleEndian.SHORT_SIZE + _stshiLength;
_styleDescriptions = new StyleDescription[stdCount]; _styleDescriptions = new StyleDescription[stdCount];
for(int x = 0; x < stdCount; x++) for(int x = 0; x < stdCount; x++)
{ {

15
src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java
View File

@ -46,6 +46,21 @@ public final class TestStyleSheet
} }
public void testReadWriteFromNonZeroOffset()
throws Exception
{
HWPFFileSystem fileSys = new HWPFFileSystem();
HWPFOutputStream tableOut = fileSys.getStream("1Table");
tableOut.write(new byte[20]); // 20 bytes of whatever at the front.
_styleSheet.writeTo(tableOut);
byte[] newTableStream = tableOut.toByteArray();
StyleSheet newStyleSheet = new StyleSheet(newTableStream, 20);
assertEquals(newStyleSheet, _styleSheet);
}
protected void setUp() protected void setUp()
throws Exception throws Exception
{ {