summaryrefslogtreecommitdiff
path: root/sw/qa/extras
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2021-01-25 15:48:46 +0100
committerLászló Németh <nemeth@numbertext.org>2021-01-26 13:06:14 +0100
commit9e21215d45b2eea31019711282445580fad0d753 (patch)
treeccc2fc544bf1366f68e8a6d770bc8e80d57e9349 /sw/qa/extras
parentd4d87c35e7e166cc6df92aa5be83eb3a65c2d02a (diff)
tdf#137655 DOCX table import: fix zero para top margin
when only w:beforeAutospacing=0 was specified, but not PARA_TOP_MARGIN (see default_spacing = -1 in processing of LN_CT_Spacing_beforeAutospacing). Follow-up of commit 61821277ed4974debd05af89cb7284602512088f (tdf#104354 writerfilter: rewrite Autospacing). Change-Id: I5fff7a8b62450ebaf8ef6b552ecbb2b1cfb24381 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109914 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/qa/extras')
-rw-r--r--sw/qa/extras/ooxmlexport/data/tdf137655.docxbin0 -> 33098 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport11.cxx8
2 files changed, 8 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf137655.docx b/sw/qa/extras/ooxmlexport/data/tdf137655.docx
new file mode 100644
index 000000000000..d87d434b324d
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf137655.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 936c7d03d348..a74bc0eed6a0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -546,6 +546,14 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113258_noBeforeAutospacing, "tdf113258_noBeforeA
getProperty<sal_Int32>(xShape->getStart(), "ParaTopMargin"));
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf137655, "tdf137655.docx")
+{
+ xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+ // These were 280.
+ assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[2]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "before", "0");
+ assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[2]/w:tc[2]/w:p[1]/w:pPr/w:spacing", "before", "0");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf120511_eatenSection, "tdf120511_eatenSection.docx")
{
xmlDocUniquePtr pXmlDoc = parseLayoutDump();