summaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2019-03-17 21:32:31 +0000
committerMichael Williamson <mike@zwobble.org>2019-03-17 21:32:31 +0000
commit4d078c3842a40d723f79a5896250ad522ebd083a (patch)
tree9c7155f238ef382f194da655a737e75bdb5cdedf /src/main/java
parenta9efb5601c128b83f5f759a837fd989e108dc61f (diff)
Pass styles into readNumberingXmlElement
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java6
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
index bb7dd38..1955e55 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
@@ -26,7 +26,7 @@ public class DocumentReader {
PartPaths partPaths = findPartPaths(zipFile);
Styles styles = readStyles(zipFile, partPaths);
- Numbering numbering = readNumbering(zipFile, partPaths);
+ Numbering numbering = readNumbering(zipFile, partPaths, styles);
ContentTypes contentTypes = readContentTypes(zipFile);
FileReader fileReader = new PathRelativeFileReader(path);
PartWithBodyReader partReader = new PartWithBodyReader(zipFile, contentTypes, fileReader, numbering, styles);
@@ -212,9 +212,9 @@ public class DocumentReader {
.orElse(Styles.EMPTY);
}
- private static Numbering readNumbering(Archive file, PartPaths partPaths) {
+ private static Numbering readNumbering(Archive file, PartPaths partPaths, Styles styles) {
return tryParseOfficeXml(file, partPaths.getNumbering())
- .map(NumberingXml::readNumberingXmlElement)
+ .map((XmlElement element) -> NumberingXml.readNumberingXmlElement(element, styles))
.orElse(Numbering.EMPTY);
}
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 0ab12b4..6b5372f 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
@@ -11,7 +11,7 @@ import static org.zwobble.mammoth.internal.util.Maps.entry;
import static org.zwobble.mammoth.internal.util.Maps.toMap;
public class NumberingXml {
- public static Numbering readNumberingXmlElement(XmlElement element) {
+ public static Numbering readNumberingXmlElement(XmlElement element, Styles styles) {
Map<String, Numbering.AbstractNum> abstractNums = readAbstractNums(element.findChildren("w:abstractNum"));
Map<String, Numbering.Num> nums = readNums(element.findChildren("w:num"));
return new Numbering(abstractNums, nums);