summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2019-09-05 16:23:00 +0200
committerLászló Németh <nemeth@numbertext.org>2019-09-06 13:38:34 +0200
commit9f6d1d5c4c75c51f36815178507e336c504025fb (patch)
tree8f3823416e4bd67886a6ea5d09ad7cd9ec7a6333 /sw/qa
parent04163422234d1becac05b16c7460518277294d6b (diff)
tdf#124604 DOCX import: fix indentation at numbering
If the actual numbering style was associated to a base paragraph style, indentation of the base paragraph style has also priority over the indentation defined in the numbering style. Change-Id: Ic57b6b854be291c75c0eb7a9dfd4c376585fe26b Reviewed-on: https://gerrit.libreoffice.org/78659 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/extras/ooxmlexport/data/tdf124604.docxbin0 -> 35311 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport11.cxx7
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf124604.docx b/sw/qa/extras/ooxmlexport/data/tdf124604.docx
new file mode 100644
index 000000000000..1bac640ecce3
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf124604.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 70ee26bbd2f4..953f6d3de38b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -915,6 +915,13 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125546, "tdf125546.docx")
assertXPath(pXmlDoc, "//w:rPrChange", 2);
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf124604, "tdf124604.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+ // If the numbering comes from a base style, indentation of the base style has also priority.
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[7]/w:pPr/w:ind", "start", "0");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf118691, "tdf118691.docx")
{
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);