summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2020-01-21 13:15:20 +0100
committerLászló Németh <nemeth@numbertext.org>2020-01-22 13:53:38 +0100
commit0c84c60f48cf681daf467c0678a768711f22e5c3 (patch)
tree880118a46fec22c167abe6cdeb5e4fbffe530f62 /sw/qa
parentda38bffa324a11441c1b8e3cd935d142141ae9ac (diff)
tdf#77419 DOCX table import: ignore right white space
in table paragraphs in MSO 2010 compatibility mode. Change-Id: I99f11c6a9f7a5735cce06fac433d5acab704cb04 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87136 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/tdf77417.docxbin0 -> 57079 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport11.cxx9
2 files changed, 7 insertions, 2 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf77417.docx b/sw/qa/extras/ooxmlexport/data/tdf77417.docx
new file mode 100644
index 000000000000..4b4fb20fee67
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf77417.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 9cb1474c5603..1bb287351c87 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -1039,14 +1039,19 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf81100, "tdf81100.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf88496, "tdf88496.docx")
{
- xmlDocPtr pXmlDoc = parseExport("word/styles.xml");
- CPPUNIT_ASSERT(pXmlDoc);
// Switch off repeating header, there is no place for it.
// Now there are only 3 pages with complete table content
// instead of a 51-page long table only with header.
CPPUNIT_ASSERT_EQUAL(3, getPages());
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf77417, "tdf77417.docx")
+{
+ // MSO 2010 compatibility mode: terminating white spaces are ignored in tables.
+ // This was 3 pages with the first invisible blank page.
+ CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121597TrackedDeletionOfMultipleParagraphs, "tdf121597.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");