diff options
| author | László Németh <nemeth@numbertext.org> | 2020-01-28 14:32:54 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-05-19 09:11:15 +0200 |
| commit | 04f4484992e8d1260e5a6c21606ba4632a7df035 (patch) | |
| tree | fcbb0723e7f455627b18d5d036e13664efc5282a /sw/qa/extras | |
| parent | e73d148cd02a934025f8d2018acf23493a9db3b3 (diff) | |
tdf#128959 DOCX import: fix missing text lines in tables
Orphan/widow line break settings aren't always ignored
by Writer table layout code, in this case, in vertically
merged cells, resulting missing paragraph lines.
As a workaround for interoperability, disable orphan/widow
control in cell paragraphs during the DOCX import to get
correct layout in Writer, too.
(cherry picked from commit 8b13da71aedd094de0d351a4bd5ad43fdb4bddde)
Conflicts:
sw/qa/extras/layout/layout.cxx
Change-Id: I48fdb0a3bb421fd4df2c729e307a7ef483e3e772
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94316
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/layout/data/tdf128959.docx | bin | 0 -> 24490 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 23 |
2 files changed, 23 insertions, 0 deletions
diff --git a/sw/qa/extras/layout/data/tdf128959.docx b/sw/qa/extras/layout/data/tdf128959.docx Binary files differnew file mode 100644 index 000000000000..f22f66504478 --- /dev/null +++ b/sw/qa/extras/layout/data/tdf128959.docx diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index d0e45b7e066b..b93da5407984 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -81,6 +81,7 @@ public: void testBtlrCell(); void testImageComment(); void testWriterImageNoCapture(); + void testTdf128959(); CPPUNIT_TEST_SUITE(SwLayoutWriter); CPPUNIT_TEST(testRedlineFootnotes); @@ -125,6 +126,7 @@ public: CPPUNIT_TEST(testBtlrCell); CPPUNIT_TEST(testImageComment); CPPUNIT_TEST(testWriterImageNoCapture); + CPPUNIT_TEST(testTdf128959); CPPUNIT_TEST_SUITE_END(); private: @@ -2975,6 +2977,27 @@ void SwLayoutWriter::testWriterImageNoCapture() CPPUNIT_ASSERT_LESS(nPageLeft, nImageLeft); } +void SwLayoutWriter::testTdf128959() +{ + // no orphan/widow control in table cells + SwDoc* pDocument = createDoc("tdf128959.docx"); + CPPUNIT_ASSERT(pDocument); + discardDumpedLayout(); + xmlDocPtr pXmlDoc = parseLayoutDump(); + + // first two lines of the paragraph in the split table cell on the first page + // (these lines were completely lost) + assertXPath( + pXmlDoc, "/root/page[1]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[1]", "Line", + "a)Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas porttitor congue "); + assertXPath( + pXmlDoc, "/root/page[1]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[2]", "Line", + "massa. Fusce posuere, magna sed pulvinar ultricies, purus lectus malesuada libero, sit "); + // last line of the paragraph in the split table cell on the second page + assertXPath(pXmlDoc, "/root/page[2]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[1]", "Line", + "amet commodo magna eros quis urna."); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SwLayoutWriter); CPPUNIT_PLUGIN_IMPLEMENT(); |