From 56ad59f2ad80d9c2a1383eabf06946a209f5fccd Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 27 Jan 2018 18:23:46 +0000 Subject: Find parts related to main document using main document relationships --- .../mammoth/internal/docx/DocumentReader.java | 27 +++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'src/main/java/org') 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 6176aec..a616aac 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java @@ -61,10 +61,18 @@ public class DocumentReader { public static class PartPaths { private final String mainDocument; private final String comments; + private final String endnotes; + private final String footnotes; + private final String numbering; + private final String styles; - public PartPaths(String mainDocument, String comments) { + public PartPaths(String mainDocument, String comments, String endnotes, String footnotes, String numbering, String styles) { this.mainDocument = mainDocument; this.comments = comments; + this.endnotes = endnotes; + this.footnotes = footnotes; + this.numbering = numbering; + this.styles = styles; } public String getMainDocument() { @@ -76,19 +84,19 @@ public class DocumentReader { } public String getEndnotes() { - return "word/endnotes.xml"; + return endnotes; } public String getFootnotes() { - return "word/footnotes.xml"; + return footnotes; } public String getNumbering() { - return "word/numbering.xml"; + return numbering; } public String getStyles() { - return "word/styles.xml"; + return styles; } } @@ -109,7 +117,14 @@ public class DocumentReader { "word/" + name + ".xml" ); - return new PartPaths(documentFilename, find.apply("comments")); + return new PartPaths( + documentFilename, + find.apply("comments"), + find.apply("endnotes"), + find.apply("footnotes"), + find.apply("numbering"), + find.apply("styles") + ); } private static Relationships readPackageRelationships(Archive archive) { -- cgit v1.2.3