diff options
| -rw-r--r-- | sw/qa/extras/uiwriter/data/tdf104814.docx | bin | 0 -> 12830 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 14 | ||||
| -rw-r--r-- | sw/source/core/doc/DocumentRedlineManager.cxx | 4 |
3 files changed, 18 insertions, 0 deletions
diff --git a/sw/qa/extras/uiwriter/data/tdf104814.docx b/sw/qa/extras/uiwriter/data/tdf104814.docx Binary files differnew file mode 100644 index 000000000000..1f1c524a8914 --- /dev/null +++ b/sw/qa/extras/uiwriter/data/tdf104814.docx diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 5dcb81eed875..bbd16708152c 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -200,6 +200,7 @@ public: void testTdf84695(); void testTdf84695NormalChar(); void testTdf78727(); + void testTdf104814(); CPPUNIT_TEST_SUITE(SwUiWriterTest); CPPUNIT_TEST(testReplaceForward); @@ -302,6 +303,7 @@ public: CPPUNIT_TEST(testTdf84695); CPPUNIT_TEST(testTdf84695NormalChar); CPPUNIT_TEST(testTdf78727); + CPPUNIT_TEST(testTdf104814); CPPUNIT_TEST_SUITE_END(); private: @@ -3716,6 +3718,18 @@ void SwUiWriterTest::testTdf78727() CPPUNIT_ASSERT(SwTextBoxHelper::getCount(pPage, aSet) > 1); } +// 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 99e9fcb6b4e1..3841491274e1 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; } |