[Libreoffice-commits] core.git: sw/qa

[Andreas Brandner]

 sw/qa/extras/ooxmlexport/data/tdf66401.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |   13 +++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit ee57d2f8a57ac851c1250f2962ecd1fa987ee3d9
Author: Andreas Brandner <Andreas.Brandner at cib.de>
Date:   Fri Oct 27 15:29:25 2017 +0200

    related tdf#66401 docx Combined Characters roundtrip unit test
    
    Change-Id: Ibe11882ab24e9161a36d195497b0a430497d7f79
    Reviewed-on: https://gerrit.libreoffice.org/43953
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/qa/extras/ooxmlexport/data/tdf66401.docx b/sw/qa/extras/ooxmlexport/data/tdf66401.docx
new file mode 100644
index 000000000000..2e2ddca375d7
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf66401.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index 736a4b9e6a24..458c91652873 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -692,6 +692,19 @@ DECLARE_OOXMLEXPORT_TEST( testTdf85161, "tdf85161.docx" )
     CPPUNIT_ASSERT_EQUAL(OUString(u'\x5e'),getParagraph(1)->getString());
 }
 
+DECLARE_OOXMLEXPORT_TEST( testTdf66401, "tdf66401.docx")
+{
+    if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
+    {
+        assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w:rFonts", 1);
+        assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w:rFonts", "ascii", "Arial Black");
+        assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w:sz", "val", "24");
+        assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[9]/w:rPr/w:rFonts", 1);
+        assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[9]/w:rPr/w:rFonts", "ascii", "Arial Black");
+        assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[9]/w:rPr/w:sz", "val", "24");
+    }
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */