From 437a3029d872ec5f2113aa6e074567de7fd2d61f Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 9 Jan 2021 17:25:55 +0000
Subject: Support numbering defined by paragraph style

---
 src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java')

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) {
-- 
cgit v1.2.3