From 2e819654db985bf8a7e7ed76e0a43dc2f46eec8d Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 23 Jan 2017 20:37:05 +0000 Subject: Handle base-relative target URIs --- src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java') diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java index ec82930..4cbdda7 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java @@ -18,12 +18,12 @@ import java.util.function.Function; import static org.zwobble.mammoth.internal.docx.ReadResult.EMPTY_SUCCESS; import static org.zwobble.mammoth.internal.docx.ReadResult.success; +import static org.zwobble.mammoth.internal.docx.Uris.uriToZipEntryName; import static org.zwobble.mammoth.internal.util.Iterables.lazyFilter; import static org.zwobble.mammoth.internal.util.Lists.list; import static org.zwobble.mammoth.internal.util.Maps.entry; import static org.zwobble.mammoth.internal.util.Maps.lookup; import static org.zwobble.mammoth.internal.util.Sets.set; -import static org.zwobble.mammoth.internal.util.Strings.trimLeft; public class BodyXmlReader { private static final Set IMAGE_TYPES_SUPPORTED_BY_BROWSERS = set( @@ -456,7 +456,7 @@ public class BodyXmlReader { private String relationshipIdToDocxPath(String relationshipId) { Relationship relationship = relationships.findRelationshipById(relationshipId); - return "word/" + trimLeft(relationship.getTarget(), '/'); + return uriToZipEntryName("word", relationship.getTarget()); } private Optional readVal(XmlElementLike element, String name) { -- cgit v1.2.3