From b826c4a4df92c5280e4f8a4d7e1bebbbb03affb3 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 20 Mar 2024 19:20:02 +0000
Subject: Prefer numbering properties to numbering from paragraph style

---
 .../mammoth/internal/docx/StatefulBodyXmlReader.java        | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
index 3be34ad..d17a404 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
@@ -354,6 +354,13 @@ class StatefulBodyXmlReader {
     }
 
     private Optional<NumberingLevel> readNumbering(Optional<Style> style, XmlElementLike properties) {
+        XmlElementLike numberingProperties = properties.findChildOrEmpty("w:numPr");
+        Optional<String> numId = readVal(numberingProperties, "w:numId");
+        Optional<String> levelIndex = readVal(numberingProperties, "w:ilvl");
+        if (numId.isPresent() && levelIndex.isPresent()) {
+            return numbering.findLevel(numId.get(), levelIndex.get());
+        }
+
         if (style.isPresent()) {
             String styleId = style.get().getStyleId();
             Optional<NumberingLevel> level = numbering.findLevelByParagraphStyleId(styleId);
@@ -362,11 +369,7 @@ class StatefulBodyXmlReader {
             }
         }
 
-        XmlElementLike numberingProperties = properties.findChildOrEmpty("w:numPr");
-        return Optionals.flatMap(
-            readVal(numberingProperties, "w:numId"),
-            readVal(numberingProperties, "w:ilvl"),
-            numbering::findLevel);
+        return Optional.empty();
     }
 
     private ParagraphIndent readParagraphIndent(XmlElementLike properties) {
-- 
cgit v1.2.3