sw/qa/extras/uiwriter/data/tdf104814.docx |binary sw/qa/extras/uiwriter/uiwriter.cxx | 14 ++++++++++++++ sw/source/core/doc/DocumentRedlineManager.cxx | 4 ++++ 3 files changed, 18 insertions(+)
New commits: commit c28006c62b6fec2f41ea2bff7ef8fe9e95da0257 Author: Noel Grandin <[email protected]> Date: Tue Dec 20 15:57:43 2016 +0200 tdf#104814 Writer: accepting change tracking changes get stuck Change-Id: Ie8e0919b53c0b21f480b62eec7c394554757a061 Reviewed-on: https://gerrit.libreoffice.org/32273 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit b7b5c23e6979205a662d857bc1c83270fb4a43ec) Reviewed-on: https://gerrit.libreoffice.org/32276 diff --git a/sw/qa/extras/uiwriter/data/tdf104814.docx b/sw/qa/extras/uiwriter/data/tdf104814.docx new file mode 100644 index 0000000..1f1c524 Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf104814.docx differ diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index d609b99..50266fe 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -216,6 +216,7 @@ public: void testLandscape(); void testTdf95699(); void testTdf104425(); + void testTdf104814(); CPPUNIT_TEST_SUITE(SwUiWriterTest); CPPUNIT_TEST(testReplaceForward); @@ -328,6 +329,7 @@ public: CPPUNIT_TEST(testLandscape); CPPUNIT_TEST(testTdf95699); CPPUNIT_TEST(testTdf104425); + CPPUNIT_TEST(testTdf104814); CPPUNIT_TEST_SUITE_END(); private: @@ -4084,6 +4086,18 @@ void SwUiWriterTest::testTdf104425() CPPUNIT_ASSERT_DOUBLES_EQUAL(700.0, fSumHeight_mm, 0.05); } +// accepting change tracking gets stuck on change +void SwUiWriterTest::testTdf104814() +{ + SwDoc* const pDoc1(createDoc("tdf104814.docx")); + + SwEditShell* const pEditShell(pDoc1->GetEditShell()); + + // accept all redlines + while(pEditShell->GetRedlineCount()) + pEditShell->AcceptRedline(0); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 38a4c77..6db6b79 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -274,6 +274,10 @@ namespace rArr.DeleteAndDestroy( rPos-- ); break; + case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: + rArr.DeleteAndDestroy( rPos-- ); + break; + default: bRet = false; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
