summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-07-02 20:31:32 +1000
committerMike Kaganski <mike.kaganski@collabora.com>2018-07-02 17:14:22 +0200
commit942f1056b51e53358d42ff8da8a1bbdce9ba5303 (patch)
tree4d626cd0cc6fe45a61c3bad1a4c7db5feb81a998 /test
parentc807e7ea7a0725a4d8375eda07d6f70870e0d50a (diff)
tdf#117923: handle direct formatting for numbering in .doc
Since commit df07d6cb9f62c0a2c4b29bd850d4efb4fcd4790b, we do for DOCX. DOC also has this problem, so set the relevant compatibility flag on import for this format, too. Change-Id: I3aef593341edffa878a06566da815cb72aa38004 Reviewed-on: https://gerrit.libreoffice.org/56812 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'test')
-rw-r--r--test/source/xmltesttools.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 45347b0c111b..c3e314e49ed4 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -88,7 +88,12 @@ OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc, const OString& rXPath)
xmlXPathNodeSetGetLength(pXmlNodes) > 0);
xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
- OUString s(convert((pXmlNode->children[0]).content));
+ xmlNodePtr pXmlChild = pXmlNode->children;
+ OUString s;
+ while (pXmlChild && pXmlChild->type != XML_TEXT_NODE)
+ pXmlChild = pXmlChild->next;
+ if (pXmlChild && pXmlChild->type == XML_TEXT_NODE)
+ s = convert(pXmlChild->content);
xmlXPathFreeObject(pXmlObj);
return s;
}