Skip to content

C
core
Kaydet (Commit) fc80f2fc authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

testOldComplexMerge: work around buggy libxml by not using // 

Change-Id: Ia53d7a2aba039386cafcf8d0030c9e768c08b743
üst e7e182bd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
Dosyayı görüntüle @ fc80f2fc
......@@ -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")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment