diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java index f8e331fe5..5c8b9b969 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java @@ -174,6 +174,41 @@ public final class ListLevel return _lvlf.getIxchFollow(); } + /** + * An unsigned integer that specifies the first (most-significant) zero-based level after which the number sequence of this level does not restart. The number sequence of this level does restart after any level that is more significant than the specified level. This MUST be less than or equal to the zero-based level of the list to which this LVLF corresponds. + *

see [MS-DOC], v20140721, 2.9.150

+ * + * @return the first ({@code 0} is the most significant) level after which + * the numbering does not restart or {@code -1} if no restart is applicable + */ + public short getRestart() { + return _lvlf.isFNoRestart() ? _lvlf.getIlvlRestartLim() : -1; + } + + /** + * Determines if the number formatting shall be overridden by + * {@code msonfcArabic}; unless it originally was {@code msonfcArabicLZ} + * in which case it is preserved. + *

see [MS-DOC], v20140721, 2.9.150 and [MS-OSHARED], v20140721, 2.2.1.3

+ * + * @return {@code true} if the level numbering of this and all more + * significant levels must be overridden; {@code false} otherwise + */ + public boolean isLegalNumbering() { + return _lvlf.isFLegal(); + } + + /** + * Array which specifies the character offsets of the level numbers in a + * level numbering string. + *

see [MS-DOC], v20140721, 2.9.150

+ * + * @return {@code 0}-terminated array, unless it is full + */ + public byte[] getLevelNumberingPlaceholderOffsets() { + return _lvlf.getRgbxchNums(); + } + int read( final byte[] data, final int startOffset ) { int offset = startOffset; diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java index eafb18fb9..d2c9ac95c 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java @@ -23,6 +23,7 @@ import junit.framework.TestCase; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.HWPFTestDataSamples; +import org.apache.poi.hwpf.model.ListLevel; /** * Tests for our handling of lists @@ -207,4 +208,47 @@ public final class TestLists extends TestCase { assertEquals(1, r.getParagraph(22).getIlvl()); assertEquals(0, r.getParagraph(23).getIlvl()); } + + public void testSpecificNumberedOrderedListFeatures() throws IOException { + HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Lists.doc"); + + Range r = doc.getRange(); + //these are in the numbered ordered list + //26 = OL 2 + //27 = OL 2.1 + //28 = OL 2.2 + //29 = OL 2.2.1 + for (int i = 26; i < 30; i++) { + Paragraph p = r.getParagraph(i); + assertTrue(p.isInList()); + HWPFList list = p.getList(); + ListLevel level = list.getLVL((char) p.getIlvl()); + assertFalse(level.isLegalNumbering()); + assertEquals(-1, level.getRestart()); + } + Paragraph p = r.getParagraph(26); + HWPFList list = p.getList(); + ListLevel level = list.getLVL((char) p.getIlvl()); + byte[] lvl = level.getLevelNumberingPlaceholderOffsets(); + + assertEquals((byte)1, lvl[0]); + assertEquals((byte)0, lvl[1]); + + p = r.getParagraph(27); + list = p.getList(); + level = list.getLVL((char) p.getIlvl()); + lvl = level.getLevelNumberingPlaceholderOffsets(); + assertEquals((byte)1, lvl[0]); + assertEquals((byte)3, lvl[1]); + + p = r.getParagraph(29); + list = p.getList(); + level = list.getLVL((char) p.getIlvl()); + lvl = level.getLevelNumberingPlaceholderOffsets(); + + assertEquals((byte)1, lvl[0]); + assertEquals((byte)3, lvl[1]); + assertEquals((byte)5, lvl[2]); + } + }