sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 514f9fc675eb3d116adb4b0a33c19c3d6e99e98b
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Apr 3 19:28:25 2015 +0200
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
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 43ced22..f04e8b9 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"))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
