sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit fc80f2fcff9871ae3c7ac9b75e3ed8f62a445906
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Apr 18 22:55:59 2015 +0200
testOldComplexMerge: work around buggy libxml by not using //
Change-Id: Ia53d7a2aba039386cafcf8d0030c9e768c08b743
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 2acca59..ee1a075 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -230,16 +230,15 @@ DECLARE_OOXMLEXPORT_TEST(testFloatingTable,
"fdo77887.docx")
DECLARE_OOXMLEXPORT_TEST(testOldComplexMerge, "tdf90681.odt")
{
- // FIXME why does this fail on MacOSX_37-tdf-buildbot
- // is the document truly different, the xslt wrong, or the system libxslt ?
-#if !defined(MACOSX)
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
if (!pXmlDoc)
return;
- assertXPath(pXmlDoc, "//w:vMerge[4]", "val", "continue");
-#endif
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:vMerge", "val", "restart");
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[2]/w:tc[2]/w:tcPr/w:vMerge", "val", "continue");
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[3]/w:tc[2]/w:tcPr/w:vMerge", "val", "continue");
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[4]/w:tc[2]/w:tcPr/w:vMerge", "val", "continue");
}
DECLARE_OOXMLEXPORT_TEST(testTablePreferredWidth, "tablePreferredWidth.docx")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
