diff options
| author | László Németh <nemeth@numbertext.org> | 2020-07-01 18:14:39 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-07-02 23:45:21 +0200 |
| commit | aea7fe41358c218a12dc34e4c0942360f0d5fde6 (patch) | |
| tree | c4caada59fdf566f95dba8e6594452d671474d8c /sw | |
| parent | 1c34bb0e2d38196df609d5f3803c6df1672986a5 (diff) | |
tdf#133735 DOCX: fix paragraph settings of nested tables
First row of a nested tables lost its paragraph
settings, by dropping the collected paragraph data of
the unfinished row.
Regression from commit 81ce88aa80f8e7cde4fdc5b211e9500a3599643c
(tdf#132514 DOCX import: fix lost table style with footer)
Change-Id: I17d81d0906f424fe35237ac285e8ad27090bcab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97645
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 8b5be44b30119b67d7b3ca9c4140046976a1df59)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97790
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index f4c29f271bcd..13d6f679bbae 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -375,6 +375,17 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFdo73389,"fdo73389.docx") assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tblPr/w:tblW","w","1611"); } +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133735, "fdo73389.docx") +{ + xmlDocUniquePtr pXmlDoc = parseExport(); + + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[2]/w:tc[1]/w:p/w:pPr/w:spacing", "after", "0"); + // This was 200 + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing", "after", "0"); + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[1]/w:tc[2]/w:p/w:pPr/w:spacing", "after", "0"); + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[1]/w:tc[3]/w:p/w:pPr/w:spacing", "after", "0"); +} + DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf59274, "tdf59274.docx") { // Table with "auto" table width and incomplete grid: 11 columns, but only 4 gridCol elements. |