summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-02-13 23:10:18 +0000
committerMichael Williamson <mike@zwobble.org>2016-02-13 23:10:18 +0000
commita67ffc8bce54b319d9da39d6c4acfdc2d5ee0335 (patch)
tree38fe269dbe5579dbd5ac1c19e07918fd102ceb54 /src
parent07d6f0cc788962d9faaec575da30cbdefdbe9637 (diff)
Read anchored images
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java1
-rw-r--r--src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java11
2 files changed, 12 insertions, 0 deletions
diff --git a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
index 4ac44d2..333780a 100644
--- a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
@@ -79,6 +79,7 @@ public class BodyXmlReader {
return readImagedata(element);
case "wp:inline":
+ case "wp:anchor":
return readInline(element);
case "w:ins":
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
index 9f7c6c5..62fced9 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -398,6 +398,12 @@ public class BodyXmlTests {
inlineImageXml(embeddedBlipXml(image.relationshipId), image.altText));
}
+ @Test
+ public void canReadAnchoredPictures() throws IOException {
+ assertCanReadEmbeddedImage(image ->
+ anchoredImageXml(embeddedBlipXml(image.relationshipId), image.altText));
+ }
+
private void assertCanReadEmbeddedImage(Function<EmbeddedImage, XmlElement> generateXml) throws IOException {
XmlElement element = generateXml.apply(new EmbeddedImage("rId5", "It's a hat"));
Relationships relationships = new Relationships(map(
@@ -431,6 +437,11 @@ public class BodyXmlTests {
element("wp:inline", imageXml(blip, description))));
}
+ private XmlElement anchoredImageXml(XmlElement blip, String description) {
+ return element("w:drawing", list(
+ element("wp:anchor", imageXml(blip, description))));
+ }
+
private List<XmlNode> imageXml(XmlElement blip, String description) {
return list(
element("wp:docPr", map("descr", description)),