diff options
| author | László Németh <nemeth@numbertext.org> | 2019-10-09 14:54:03 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-10-09 19:48:09 +0200 |
| commit | 39090afac268f9ae985832c2f08863b41e6c06f2 (patch) | |
| tree | d55d2659f17e9ac9233972e54789fec70df0e502 /sw | |
| parent | b8e1eebaccf65040f98c27001eb853bdc8b6a344 (diff) | |
tdf#120336 DOCX import: fix page break after tracked deletion
Actual text content lost its page break, when the last
paragraph of the section was empty and preceded only with
tracked deletion.
See also commit b696600821d8aafb63b6a88016d299ef89478f56
"n#766481 dmapper: don't import fake paragraph containing sectpr only, take two"
Change-Id: I6b1c47da2b618f10ca4887f050469f94efa2a7cb
Reviewed-on: https://gerrit.libreoffice.org/80540
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/uiwriter/data2/tdf120336.docx | bin | 0 -> 21892 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter2.cxx | 26 |
2 files changed, 26 insertions, 0 deletions
diff --git a/sw/qa/extras/uiwriter/data2/tdf120336.docx b/sw/qa/extras/uiwriter/data2/tdf120336.docx Binary files differnew file mode 100644 index 000000000000..a9152bf31d07 --- /dev/null +++ b/sw/qa/extras/uiwriter/data2/tdf120336.docx diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx index 86412fd3ab24..50df467a168f 100644 --- a/sw/qa/extras/uiwriter/uiwriter2.cxx +++ b/sw/qa/extras/uiwriter/uiwriter2.cxx @@ -1719,6 +1719,32 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf125310b) CPPUNIT_ASSERT_EQUAL(1, getPages()); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf120336) +{ + load(DATA_DIRECTORY, "tdf120336.docx"); + + SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); + CPPUNIT_ASSERT(pTextDoc); + + // turn on red-lining and show changes + SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowDelete + | RedlineFlags::ShowInsert); + CPPUNIT_ASSERT_MESSAGE("redlining should be on", + pDoc->getIDocumentRedlineAccess().IsRedlineOn()); + CPPUNIT_ASSERT_MESSAGE( + "redlines should be visible", + IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags())); + + CPPUNIT_ASSERT_EQUAL(2, getPages()); + + IDocumentRedlineAccess& rIDRA(pDoc->getIDocumentRedlineAccess()); + rIDRA.AcceptAllRedline(true); + + // keep page break, as without redlining + CPPUNIT_ASSERT_EQUAL(2, getPages()); +} + CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testImageComment) { // Load a document with an as-char image in it. |