diff options
| author | Justin Luth <justin_luth@sil.org> | 2021-08-14 21:28:50 +0200 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2021-08-18 06:21:13 +0200 |
| commit | 28a7fec1f6465f8bfee417d447eb2e684ffe040b (patch) | |
| tree | 88d30198e4fbc81cb088f4307ac19b4f86ae9f2f /sw | |
| parent | b10b26f01c241b939da9b49f22239d4fea23eb7a (diff) | |
tdf#134569 writerfilter: move tableParaProps on table endLevel
The end-level of a table only comes at the ::finishParagraph
of the FOLLOWING paragraph. So for table-in-table, it is
necessary to move the paragraph properties captured
during the paragraph to the correct table level's collection.
This fixes 7.0 regression from
commit 81ce88aa80f8e7cde4fdc5b211e9500a3599643c
and depends on prior commit
related tdf#134569 writerfilter: negative means table end
Change-Id: I83183f38e1cf68b7db09813ca1b4a2491e7b54e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120526
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw')
| -rwxr-xr-x | sw/qa/extras/ooxmlexport/data/tdf134569_nestedTable.docx | bin | 0 -> 17060 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf134569_nestedTable.docx b/sw/qa/extras/ooxmlexport/data/tdf134569_nestedTable.docx Binary files differnew file mode 100755 index 000000000000..7fb07eb32a19 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf134569_nestedTable.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index 9f26fd565035..2222b20d0b07 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -395,6 +395,12 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133735, "fdo73389.docx") 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(testTdf134569_nestedTable, "tdf134569_nestedTable.docx") +{ + // non-overridden w:after spacing in the table was pushing the document to the second page. + CPPUNIT_ASSERT_EQUAL(1, getPages()); +} + DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf59274, "tdf59274.docx") { // Table with "auto" table width and incomplete grid: 11 columns, but only 4 gridCol elements. |