diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 120f6dc70..7185c3e01 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + 48038 - handle reading HWPF stylesheets from non zero offsets When running the "compile-ooxml-xsds" ant task, also generate the source jar for the OOXML Schemas 45672 - improve handling by MissingRecordAwareHSSFListener of records that cover multiple cells (MulBlankRecord and MulRKRecord) 48096 - relaxed validation check in RecalcIdRecord diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java b/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java index edb74eace..647746d82 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java @@ -65,6 +65,7 @@ public final class StyleSheet implements HDFType { */ public StyleSheet(byte[] tableStream, int offset) { + int startOffset = offset; _stshiLength = LittleEndian.getShort(tableStream, offset); offset += LittleEndian.SHORT_SIZE; int stdCount = LittleEndian.getShort(tableStream, offset); @@ -88,7 +89,7 @@ public final class StyleSheet implements HDFType { _rgftc[2] = LittleEndian.getShort(tableStream, offset); offset += LittleEndian.SHORT_SIZE; - offset = (LittleEndian.SHORT_SIZE + _stshiLength); + offset = startOffset + LittleEndian.SHORT_SIZE + _stshiLength; _styleDescriptions = new StyleDescription[stdCount]; for(int x = 0; x < stdCount; x++) { diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java b/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java index d092441e0..8bae9aba0 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java @@ -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() throws Exception {