[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/qa sw/source

[Noel Grandin]

 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 5b5f351785670e7310e0c074d8b96f2538cf0f2f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Dec 20 15:57:43 2016 +0200

    tdf#104814 Writer: accepting change tracking changes get stuck
    
    Reviewed-on: https://gerrit.libreoffice.org/32273
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit b7b5c23e6979205a662d857bc1c83270fb4a43ec)
    Reviewed-on: https://gerrit.libreoffice.org/32276
    
    Change-Id: Ie8e0919b53c0b21f480b62eec7c394554757a061
    Reviewed-on: https://gerrit.libreoffice.org/32887
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

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 5dcb81e..bbd1670 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 99e9fcb..3841491 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;
         }