[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source

[Tamás Zolnai]

 sw/source/core/crsr/crsrsh.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a932f845a3054d3d5b6d9515eeceea0060fbc4ef
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Sat Jan 6 20:56:04 2018 +0100

    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 at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 0b8713ea0c0290ed2a4d711f44bf9a19b214bb62)
    Reviewed-on: https://gerrit.libreoffice.org/47545
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

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();