sw/source/core/doc/DocumentRedlineManager.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
New commits: commit c033d8e5a662eec3c1104b70f33cf0795c8c211c Author: Henry Castro <hcas...@collabora.com> AuthorDate: Wed Mar 27 14:41:54 2019 -0400 Commit: Henry Castro <hcas...@collabora.com> CommitDate: Thu Mar 28 13:15:03 2019 +0100 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 <hcas...@collabora.com> diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index a94e9a514089..b5431a0a79e7 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -2656,6 +2656,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete void DocumentRedlineManager::AcceptAllRedline(bool bAccept) { + bool bSuccess = true; OUString sUndoStr; IDocumentUndoRedo& rUndoMgr = m_rDoc.GetIDocumentUndoRedo(); @@ -2672,12 +2673,12 @@ void DocumentRedlineManager::AcceptAllRedline(bool bAccept) rUndoMgr.StartUndo(bAccept ? SwUndoId::ACCEPT_REDLINE : SwUndoId::REJECT_REDLINE, &aRewriter); } - while (!mpRedlineTable->empty()) + 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()) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits