summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2018-01-06 20:56:04 +0100
committerJan Holesovsky <kendy@collabora.com>2018-01-15 12:21:26 +0100
commita932f845a3054d3d5b6d9515eeceea0060fbc4ef (patch)
treea3ad36226b383d187e9c928feedbca273d232772 /sw
parent8c4d8bc4654d8809ff0f431dc930d6167d86158c (diff)
tdf#114872: Broken selection from other user
For desktop LO cursor update is restricted to the active view, but for LO online the users's selection is shown also from other views. Change-Id: Ia9bc8854ee570a9a22c183bf27f941ecf0b8e4d9 Reviewed-on: https://gerrit.libreoffice.org/47520 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 0b8713ea0c0290ed2a4d711f44bf9a19b214bb62) Reviewed-on: https://gerrit.libreoffice.org/47545 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/crsr/crsrsh.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 094d11a4e29d..e7f211c3d7ac 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1842,7 +1842,10 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
if( m_pBlockCursor )
RefreshBlockCursor();
- if( !bIdleEnd && m_bHasFocus && !m_bBasicHideCursor )
+ // We should not restrict cursor update to the active view when using LOK
+ bool bCheckFocus = m_bHasFocus || comphelper::LibreOfficeKit::isActive();
+
+ if( !bIdleEnd && bCheckFocus && !m_bBasicHideCursor )
{
if( m_pTableCursor )
m_pTableCursor->SwSelPaintRects::Show();