diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-03 19:28:25 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-03 19:30:29 +0200 |
| commit | 514f9fc675eb3d116adb4b0a33c19c3d6e99e98b (patch) | |
| tree | 65e805873d286047f079649f59b8e9b9c3bfd8f9 /sw | |
| parent | 2ec69c6fea4594f3f00c22ac9bb31a888483b318 (diff) | |
CppunitTest_sw_ooxmlexport5: fix Fedora 22 alpha build
09:41 <@dtardon> vmiklos, maybe it's a regression in libxml2. "Fix XPath '//' optimization with predicates (Nick Wellnhofer)" in NEWS looks suspicious
So tweak the XPath not to use // for now.
Change-Id: Ia1c4508d8aede5818bc258d6e4243f026da3a3cd
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index 43ced22934d9..f04e8b9c0bb8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -745,16 +745,8 @@ DECLARE_OOXMLEXPORT_TEST(testSectionProtection, "sectionprot.odt") { if (xmlDocPtr pXmlDoc = parseExport("word/document.xml")) { -#ifdef MACOSX - xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, "//w:formProt[1]"); - xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval; - if (xmlXPathNodeSetGetLength(pXmlNodes) != 1) - // We asked for exactly one node, got more than that, then give up testing. - return; -#endif - - assertXPath(pXmlDoc, "//w:formProt[1]", "val", "true"); - assertXPath(pXmlDoc, "//w:formProt[2]", "val", "false"); + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:pPr/w:sectPr/w:formProt", "val", "true"); + assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:formProt", "val", "false"); } if (xmlDocPtr pXmlSettings = parseExport("word/settings.xml")) |