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

[Tamás Zolnai]

 sw/source/core/crsr/crsrsh.cxx |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 075112bc4de73ab581b65f8ae5bb2db0d84ec87d
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Tue Apr 10 21:17:40 2018 +0200

    sw lok: followup commit for change about scrolling to visible cursor
    
    Revert small part of this commit:
    83b7bfc0efefb3c77e5c59553320e98539250c62
    
    Thanks Jan Holesovsky to catching it.
    
    Reviewed-on: https://gerrit.libreoffice.org/52684
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 508013d799358bb1c92b5cfea5257fe53c695cee)
    
    Change-Id: I885c9f3da622052685d1e46f6358783fc7f8cb9a
    Reviewed-on: https://gerrit.libreoffice.org/52702
    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 02439fbb437c..37a81c0cd679 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1428,13 +1428,6 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
     SET_CURR_SHELL( this );
     ClearUpCursors();
 
-    bool bScrollWin = eFlags & SwCursorShell::SCROLLWIN;
-    // Don't scroll to the cursor if it's moved by an other view
-    if(comphelper::LibreOfficeKit::isActive() && bScrollWin)
-    {
-        bScrollWin = SfxLokHelper::getView() != SfxLokHelper::getView(GetSfxViewShell());
-    }
-
     // In a BasicAction the cursor must be updated, e.g. to create the
     // TableCursor. EndAction now calls UpdateCursor!
     if( ActionPend() && BasicActionPend() )
@@ -1577,7 +1570,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
 
             m_pVisibleCursor->Hide(); // always hide visible Cursor
             // scroll Cursor to visible area
-            if( bScrollWin &&
+            if( eFlags & SwCursorShell::SCROLLWIN &&
                 (HasSelection() || eFlags & SwCursorShell::READONLY ||
                  !IsCursorReadonly()) )
             {
@@ -1832,7 +1825,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
         }
 
         // scroll Cursor to visible area
-        if( m_bHasFocus && bScrollWin&&
+        if( m_bHasFocus && eFlags & SwCursorShell::SCROLLWIN &&
             (HasSelection() || eFlags & SwCursorShell::READONLY ||
              !IsCursorReadonly() || GetViewOptions()->IsSelectionInReadonly()) )
         {
@@ -1844,7 +1837,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
             m_bSVCursorVis = bSav;
         }
 
-    } while( bScrollWin );
+    } while( eFlags & SwCursorShell::SCROLLWIN );
 
     if( m_pBlockCursor )
         RefreshBlockCursor();