diff options
| author | Henry Castro <hcastro@collabora.com> | 2019-03-27 14:41:54 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2019-03-28 13:15:03 +0100 |
| commit | c033d8e5a662eec3c1104b70f33cf0795c8c211c (patch) | |
| tree | 17d0c3aea845b71df54737d134dae3f370aa03fc /sw | |
| parent | 2b80764ec0f7c8e2c85dbca67b9cb8a2e6b2b143 (diff) | |
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@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/DocumentRedlineManager.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
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()) |