Kaydet (Commit) 40cddf85 authored tarafından Henry Castro's avatar Henry Castro Kaydeden (comit) Jan Holesovsky

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: 's avatarHenry Castro <hcastro@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/70202Reviewed-by: 's avatarJan Holesovsky <kendy@collabora.com>
Tested-by: 's avatarJan Holesovsky <kendy@collabora.com>
üst 5e2270a1
...@@ -2342,6 +2342,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete ...@@ -2342,6 +2342,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete
void DocumentRedlineManager::AcceptAllRedline(bool bAccept) void DocumentRedlineManager::AcceptAllRedline(bool bAccept)
{ {
bool bSuccess = true;
OUString sUndoStr; OUString sUndoStr;
IDocumentUndoRedo& rUndoMgr = m_rDoc.GetIDocumentUndoRedo(); IDocumentUndoRedo& rUndoMgr = m_rDoc.GetIDocumentUndoRedo();
...@@ -2358,12 +2359,12 @@ void DocumentRedlineManager::AcceptAllRedline(bool bAccept) ...@@ -2358,12 +2359,12 @@ void DocumentRedlineManager::AcceptAllRedline(bool bAccept)
rUndoMgr.StartUndo(bAccept ? SwUndoId::ACCEPT_REDLINE : SwUndoId::REJECT_REDLINE, &aRewriter); rUndoMgr.StartUndo(bAccept ? SwUndoId::ACCEPT_REDLINE : SwUndoId::REJECT_REDLINE, &aRewriter);
} }
while (mpRedlineTable->size() > 0) while (!mpRedlineTable->empty() && bSuccess)
{ {
if (bAccept) if (bAccept)
AcceptRedline(mpRedlineTable->size() - 1, true); bSuccess = AcceptRedline(mpRedlineTable->size() - 1, true);
else else
RejectRedline(mpRedlineTable->size() - 1, true); bSuccess = RejectRedline(mpRedlineTable->size() - 1, true);
} }
if (!sUndoStr.isEmpty()) if (!sUndoStr.isEmpty())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment