diff options
author | László Németh <nemeth@numbertext.org> | 2019-11-15 10:37:42 +0100 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2019-11-15 14:26:12 +0100 |
commit | d8f3f8ecd9e6304f3a98ab03fae6bc545893f782 (patch) | |
tree | 3a5f1e10b7a17fd9374e57965a2da2f8e107f9da /sw/qa | |
parent | 2a1533b0191508d4836a0f4fd1f4c8011a467d9f (diff) |
tdf#128752 DOCX: fix partial direct paragraph spacing in tables
When direct formatting of a table paragraph set only top margin,
but not the bottom margin, also there was no paragraph style setting
for the bottom margin, the paragraph was imported using docDefault
bottom spacing instead of the table style bottom spacing.
Change-Id: Ib7f5f80dd2485a0fd4ab8e0645b7d730a7ec3c5c
Reviewed-on: https://gerrit.libreoffice.org/82771
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/tdf128752.docx | bin | 0 -> 13621 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf128752.docx b/sw/qa/extras/ooxmlexport/data/tdf128752.docx Binary files differnew file mode 100644 index 000000000000..0e49291414d7 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf128752.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx index bd80a537e12a..9e0859f028e7 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx @@ -459,6 +459,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf127814, "tdf127814.docx") assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing", "before", "0"); } +DECLARE_OOXMLEXPORT_TEST(testTdf128752, "tdf128752.docx") +{ + // Paragraph bottom margin was 200, docDefault instead of table style setting + xmlDocPtr pXmlDoc = parseExport(); + if (!pXmlDoc) + return; + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "after", "0"); +} + DECLARE_OOXMLEXPORT_TEST(testFdo69636, "fdo69636.docx") { /* |