[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source

[Henry Castro (via logerrit)]

 sw/source/core/doc/DocumentRedlineManager.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 40cddf85c58239258c794d28090183534eb4d6fc
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Mar 27 14:41:54 2019 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Apr 25 13:34:36 2019 +0200

    tdf#120338: The paragraph formatting changes are not undone, part 1
    
    Rejecting paragraph formatting is not implemented yet.
    "Reject All" command is affected because the changes were not removed
    
    Change-Id: Ic4af1def97025643ecbc5cf0752cd06d9b94c74a
    Reviewed-on: https://gerrit.libreoffice.org/69865
    Tested-by: Jenkins
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/70202
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 6aad179ab11e..b372114720f5 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -2342,6 +2342,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete
 
 void DocumentRedlineManager::AcceptAllRedline(bool bAccept)
 {
+    bool bSuccess = true;
     OUString sUndoStr;
     IDocumentUndoRedo& rUndoMgr = m_rDoc.GetIDocumentUndoRedo();
 
@@ -2358,12 +2359,12 @@ void DocumentRedlineManager::AcceptAllRedline(bool bAccept)
         rUndoMgr.StartUndo(bAccept ? SwUndoId::ACCEPT_REDLINE : SwUndoId::REJECT_REDLINE, &aRewriter);
     }
 
-    while (mpRedlineTable->size() > 0)
+    while (!mpRedlineTable->empty() && bSuccess)
     {
         if (bAccept)
-            AcceptRedline(mpRedlineTable->size() - 1, true);
+            bSuccess = AcceptRedline(mpRedlineTable->size() - 1, true);
         else
-            RejectRedline(mpRedlineTable->size() - 1, true);
+            bSuccess = RejectRedline(mpRedlineTable->size() - 1, true);
     }
 
     if (!sUndoStr.isEmpty())