aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2021-01-09 17:25:55 +0000
committerMichael Williamson <mike@zwobble.org>2021-01-09 17:25:55 +0000
commit437a3029d872ec5f2113aa6e074567de7fd2d61f (patch)
tree1ab117b3ca019f6232d842113e45f5097107d419 /src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
parente65a011e679931377af77793fc36b671766c4118 (diff)
Support numbering defined by paragraph style
Diffstat (limited to 'src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java')
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
index b25ffdd..5f811db 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
@@ -1,6 +1,5 @@
package org.zwobble.mammoth.internal.docx;
-import org.zwobble.mammoth.internal.documents.NumberingLevel;
import org.zwobble.mammoth.internal.xml.XmlElement;
import org.zwobble.mammoth.internal.xml.XmlElementList;
@@ -31,15 +30,16 @@ public class NumberingXml {
return entry(abstractNumId, abstractNum);
}
- private static Map<String, NumberingLevel> readAbstractNumLevels(XmlElement element) {
+ private static Map<String, Numbering.AbstractNumLevel> readAbstractNumLevels(XmlElement element) {
return toMap(element.findChildren("w:lvl"), NumberingXml::readAbstractNumLevel);
}
- private static Map.Entry<String, NumberingLevel> readAbstractNumLevel(XmlElement element) {
+ private static Map.Entry<String, Numbering.AbstractNumLevel> readAbstractNumLevel(XmlElement element) {
String levelIndex = element.getAttribute("w:ilvl");
Optional<String> numFmt = element.findChildOrEmpty("w:numFmt").getAttributeOrNone("w:val");
boolean isOrdered = !numFmt.equals(Optional.of("bullet"));
- return entry(levelIndex, new NumberingLevel(levelIndex, isOrdered));
+ Optional<String> paragraphStyleId = element.findChildOrEmpty("w:pStyle").getAttributeOrNone("w:val");
+ return entry(levelIndex, new Numbering.AbstractNumLevel(levelIndex, isOrdered, paragraphStyleId));
}
private static Map<String, Numbering.Num> readNums(XmlElementList numElements) {