diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-14 14:42:26 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-14 17:28:31 +0100 |
| commit | b3dc0d7c72c2bb997bfceaeaf25dc9153ceca244 (patch) | |
| tree | 991103d43b0cc29be44eeb9aa186b0c33d504593 /vcl/source | |
| parent | 5730388b6e8cd1345318afedb00afcfc139287a5 (diff) | |
sw lok comments: implement mouse move and mouse up
As long as we don't tweak the map mode of the comment widgets
permanently we also have to disable the selection engine's timer, as
that would emit events without the correct map mode: so disable that for
the LOK case for now.
Change-Id: If377ff2f064c30feb473f153f9d5b29b8ace7113
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/seleng.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index 7999818b509c..69b220bedfcc 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -20,6 +20,7 @@ #include <vcl/window.hxx> #include <vcl/seleng.hxx> #include <tools/debug.hxx> +#include <comphelper/lok.hxx> FunctionSet::~FunctionSet() { @@ -301,7 +302,9 @@ bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt ) return true; aWTimer.SetTimeout( nUpdateInterval ); - aWTimer.Start(); + if (!comphelper::LibreOfficeKit::isActive()) + // Generating fake mouse moves does not work with LOK. + aWTimer.Start(); if ( eSelMode != SINGLE_SELECTION ) { if ( !(nFlags & SelectionEngineFlags::HAS_ANCH) ) |