[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source

[Jim Raykowski]

 sw/source/uibase/utlui/content.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit a7523f5b4d2995900f38c1f24fa75db2995a50f7
Author: Jim Raykowski <raykowj at gmail.com>
Date:   Sat Sep 16 17:54:43 2017 -0800

    tdf#112435 Scroll to navigated position
    
    Force scroll to position of navigation when navigating to
    inactive document using Navigator.
    
    Change-Id: I8671973f5fdb5f4158a7795bf0b3381db867d57a
    Reviewed-on: https://gerrit.libreoffice.org/44330
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 33021ea5c6a5c7aebd4f11ec5e2b4502a3fbfd7f)
    Reviewed-on: https://gerrit.libreoffice.org/44391
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index b7a29bcea450..876a1188e479 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3467,6 +3467,14 @@ void SwContentTree::GotoContent(SwContent* pCnt)
     rView.StopShellTimer();
     rView.GetPostItMgr()->SetActiveSidebarWin(nullptr);
     rView.GetEditWin().GrabFocus();
+
+    // force scroll to cursor position when navigating to inactive document
+    if(!bSel)
+    {
+        Point rPoint = m_pActiveShell->GetCursorDocPos();
+        rPoint.setX(0);
+        rView.SetVisArea(rPoint);
+    }
 }
 
 // Now even the matching text::Bookmark