[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/qa

[Samuel Mehrbrodt]

 sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt |binary
 sw/qa/extras/fodfexport/fodfexport.cxx                 |   13 +++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 6ac72f5f7584adc11341c6986dc4bf4d5f7f933f
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Dec 4 09:14:27 2017 +0100

    Related tdf#113696 Unit test for Writer images fallback graphic
    
    Change-Id: I2f14d6ab9a107f5b50ab0ec83019f86751dd79f6
    Reviewed-on: https://gerrit.libreoffice.org/45778
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 282bc5a824d103dcf4b19c9cf83698a2334e2e34)
    Reviewed-on: https://gerrit.libreoffice.org/45803

diff --git a/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt b/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt
new file mode 100644
index 000000000000..f8aee0836011
Binary files /dev/null and b/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt differ
diff --git a/sw/qa/extras/fodfexport/fodfexport.cxx b/sw/qa/extras/fodfexport/fodfexport.cxx
index 6cd00b49ba47..c79d0f35b420 100644
--- a/sw/qa/extras/fodfexport/fodfexport.cxx
+++ b/sw/qa/extras/fodfexport/fodfexport.cxx
@@ -40,5 +40,18 @@ DECLARE_FODFEXPORT_TEST(testTdf113696, "tdf113696.odt")
     }
 }
 
+DECLARE_FODFEXPORT_TEST(testTdf113696WriterImage, "tdf113696-writerimage.odt")
+{
+    // Same as testTdf113696, but with a writer image instead of a draw image
+    // (they use different code paths).
+    if (xmlDocPtr pXmlDoc = parseExportedFile())
+    {
+        assertXPath(pXmlDoc, "/office:document/office:body/office:text/text:p/draw:frame/"
+                             "draw:image[@loext:mime-type='image/x-vclgraphic']");
+        assertXPath(pXmlDoc, "/office:document/office:body/office:text/text:p/draw:frame/"
+                             "draw:image[@loext:mime-type='image/png']");
+    }
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */