summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
authorMarco Cecchetti <marco.cecchetti@collabora.com>2017-01-06 18:35:08 +0100
committerJan Holesovsky <kendy@collabora.com>2017-01-11 17:07:15 +0100
commitee821f3cc68838910e1a06b6141c2580152640d3 (patch)
tree594596e94752f88f54836480a4fece469ef6893a /sc/source/ui
parenta98c5fbc9fdde5e5c489ca8b50d47598246a011a (diff)
LOK: Calc: limiting undo and add support for repair modecp-5.1-17
During collaborative editing changes can be undone regardless of who made them. This patch avoids this possibility and introduce support for repair mode, for cases where undo/redo of others' changes is intentional. Change-Id: I69fd435e96c4c675ffd1df81e936b5eae109daa0
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/view/tabvwshb.cxx28
1 files changed, 28 insertions, 0 deletions
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 2864c7bf921d..5ad79bfcfd82 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -62,6 +62,7 @@
#include <tools/urlobj.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <comphelper/lok.hxx>
using namespace com::sun::star;
@@ -511,6 +512,33 @@ void ScTabViewShell::ExecuteUndo(SfxRequest& rReq)
if ( pReqArgs && pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET )
nCount = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
+ // Repair mode: allow undo/redo of all undo actions, even if access would
+ // be limited based on the view shell ID.
+ bool bRepair = false;
+ if (pReqArgs && pReqArgs->GetItemState(SID_REPAIRPACKAGE, false, &pItem) == SfxItemState::SET)
+ bRepair = static_cast<const SfxBoolItem*>(pItem)->GetValue();
+
+ if (comphelper::LibreOfficeKit::isActive() && !bRepair)
+ {
+ SfxUndoAction* pAction = nullptr;
+ if (bIsUndo)
+ {
+ if (pUndoManager->GetUndoActionCount() != 0)
+ pAction = pUndoManager->GetUndoAction();
+ }
+ else
+ {
+ if (pUndoManager->GetRedoActionCount() != 0)
+ pAction = pUndoManager->GetRedoAction();
+ }
+ if (pAction)
+ {
+ sal_Int32 nViewShellId = GetViewShellId();
+ if (pAction->GetViewShellId() != nViewShellId)
+ return;
+ }
+ }
+
// lock paint for more than one cell undo action (not for editing within a cell)
bool bLockPaint = ( nCount > 1 && pUndoManager == GetUndoManager() );
if ( bLockPaint )