diff options
author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2016-09-16 12:36:06 +0200 |
---|---|---|
committer | Marco Cecchetti <mrcekets@gmail.com> | 2016-10-03 12:05:59 +0000 |
commit | f5ed92549b9f113cbe252820a01a098b2b9d65ab (patch) | |
tree | 56ac9776c3d506ab77c0137e9e8f1d39de93f94e /sc/source/ui/app/scmod.cxx | |
parent | 348dcf1edb1a45027b52ba1e6f15bbf4d484a2c5 (diff) |
LOK - when a view is enabled, the existing edit views are killed
A view is notified about killing its own edit view, if any, in 4
cases:
- before being deactivated
- soon after being activated
- when a 'cursor position changed' event occurs in any view
- when a 'selection changed' event occurs in any view
Now these notifications are skipped when LOK is active.
Change-Id: I94020987a35b1450ec41e2fa5fcce8cfa7e92130
Reviewed-on: https://gerrit.libreoffice.org/28948
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Diffstat (limited to 'sc/source/ui/app/scmod.cxx')
-rw-r--r-- | sc/source/ui/app/scmod.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 8b0e101f45fb..561ff2bfea95 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -20,6 +20,7 @@ #include <config_features.h> #include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include "scitems.hxx" @@ -1369,12 +1370,12 @@ ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, bool bUseRef ) return pHdl; } -void ScModule::ViewShellChanged() +void ScModule::ViewShellChanged(bool bStopEditing /*=true*/) { ScInputHandler* pHdl = GetInputHdl(); ScTabViewShell* pShell = ScTabViewShell::GetActiveViewShell(); if ( pShell && pHdl ) - pShell->UpdateInputHandler(); + pShell->UpdateInputHandler(false, bStopEditing); } void ScModule::SetInputMode( ScInputMode eMode, const OUString* pInitText ) |