diff options
| author | Henry Castro <hcastro@collabora.com> | 2016-11-24 07:09:38 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2016-11-28 02:26:23 +0000 |
| commit | 2db42ab241d0852d89a470b18727c22d0fc06745 (patch) | |
| tree | 40af961c0846fdd68a657938d5d1fd61f3c69024 /sw/source/core/undo/docundo.cxx | |
| parent | e2d5f1ba3fd0db00276cf48b0d9be9b16dcbf7a0 (diff) | |
sw lok: notify repair when exist a conflict of multiple users undo/redo
Change-Id: I026f4df6239fa87ee191f92127f9fa98ac2993eb
Reviewed-on: https://gerrit.libreoffice.org/31161
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Diffstat (limited to 'sw/source/core/undo/docundo.cxx')
| -rw-r--r-- | sw/source/core/undo/docundo.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 56c9e3aa9212..4d117dac50ae 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -372,7 +372,13 @@ UndoManager::GetLastUndoInfo( // If an other view created the undo action, prevent undoing it from this view. sal_Int32 nViewShellId = pView ? pView->GetViewShellId() : m_pDocShell->GetView()->GetViewShellId(); if (pAction->GetViewShellId() != nViewShellId) + { + if (o_pId) + { + *o_pId = UNDO_CONFLICT; + } return false; + } } if (o_pStr) @@ -425,7 +431,13 @@ bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr, // If an other view created the undo action, prevent redoing it from this view. sal_Int32 nViewShellId = pView ? pView->GetViewShellId() : m_pDocShell->GetView()->GetViewShellId(); if (pAction->GetViewShellId() != nViewShellId) + { + if (o_pId) + { + *o_pId = UNDO_CONFLICT; + } return false; + } } if (o_pStr) |