From f2fd5ec08b2b87278f2929d7c15c9ed71fbac8d8 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 17 Mar 2019 21:44:44 +0000 Subject: Follow w:numStyleLink in w:abstractNum --- src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 6b5372f..b25ffdd 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java @@ -14,7 +14,7 @@ public class NumberingXml { public static Numbering readNumberingXmlElement(XmlElement element, Styles styles) { Map abstractNums = readAbstractNums(element.findChildren("w:abstractNum")); Map nums = readNums(element.findChildren("w:num")); - return new Numbering(abstractNums, nums); + return new Numbering(abstractNums, nums, styles); } private static Map readAbstractNums(XmlElementList children) { @@ -24,7 +24,11 @@ public class NumberingXml { private static Map.Entry readAbstractNum(XmlElement element) { // TODO: in python-mammoth, we allow None here. Check whether that's actually possible or not String abstractNumId = element.getAttribute("w:abstractNumId"); - return entry(abstractNumId, new Numbering.AbstractNum(readAbstractNumLevels(element))); + Numbering.AbstractNum abstractNum = new Numbering.AbstractNum( + readAbstractNumLevels(element), + element.findChildOrEmpty("w:numStyleLink").getAttributeOrNone("w:val") + ); + return entry(abstractNumId, abstractNum); } private static Map readAbstractNumLevels(XmlElement element) { -- cgit v1.2.3