summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2018-01-06 20:56:04 +0100
committerAndras Timar <andras.timar@collabora.com>2018-03-15 23:03:46 +0100
commit983d8452423033a2220aca6bfab2fd7ab71500ba (patch)
tree93e727524e5af3f1bd2032dba30a1aecfefafca6 /sw/source/core
parent726c07a03c8d2374bba7edffce2ac2a1a2a88c3c (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)
Diffstat (limited to 'sw/source/core')
-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 48d2aabaa3ed..bffde7e0a90e 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1829,7 +1829,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();