tdf#111837 removed lag in navigator selection update

Change-Id: I0d15f8352ab1d8846df3b03334bda20550d117d2
Reviewed-on: https://gerrit.libreoffice.org/48717Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>

include/svtools/treelistbox.hxx

@@ -746,6 +746,7 @@ public:
 
     SvTreeListEntry*    GetFirstEntryInView() const;
     SvTreeListEntry*    GetNextEntryInView(SvTreeListEntry*) const;
+    SvTreeListEntry*    GetPrevEntryInView(SvTreeListEntry*) const;
     SvTreeListEntry*    GetLastEntryInView() const;
     void            ScrollToAbsPos( long nPos );
 

sd/source/ui/dlg/navigatr.cxx

@@ -222,13 +222,27 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void)
     PageJump ePage = PAGE_NONE;
 
     if (sCommand == "first")
+    {
         ePage = PAGE_FIRST;
+        maTlbObjects->Select( maTlbObjects->GetFirstEntryInView() );
+    }
     else if (sCommand == "previous")
+    {
         ePage = PAGE_PREVIOUS;
+        if( maTlbObjects->GetPrevEntryInView( maTlbObjects->GetCurEntry() ) != nullptr )
+            maTlbObjects->Select( maTlbObjects->GetPrevEntryInView( maTlbObjects->GetCurEntry() ) );
+    }
     else if (sCommand == "next")
+    {
         ePage = PAGE_NEXT;
+        if( maTlbObjects->GetNextEntryInView( maTlbObjects->GetCurEntry() ) != nullptr )
+            maTlbObjects->Select( maTlbObjects->GetNextEntryInView( maTlbObjects->GetCurEntry() ) );
+    }
     else if (sCommand == "last")
+    {
         ePage = PAGE_LAST;
+        maTlbObjects->Select( maTlbObjects->GetLastEntryInView() );
+    }
 
     if (ePage != PAGE_NONE)
     {

svtools/source/contnr/treelistbox.cxx

@@ -3489,6 +3489,19 @@ SvTreeListEntry* SvTreeListBox::GetNextEntryInView(SvTreeListEntry* pEntry ) con
     return pNext;
 }
 
+SvTreeListEntry* SvTreeListBox::GetPrevEntryInView(SvTreeListEntry* pEntry ) const
+{
+    SvTreeListEntry* pPrev = PrevVisible( pEntry );
+    if( pPrev )
+    {
+        Point aPos( GetEntryPosition(pPrev) );
+        const Size& rSize = pImpl->GetOutputSize();
+        if( aPos.Y() < 0 || aPos.Y() >= rSize.Height() )
+            return nullptr;
+    }
+    return pPrev;
+}
+
 SvTreeListEntry* SvTreeListBox::GetLastEntryInView() const
 {
     SvTreeListEntry* pEntry = GetFirstEntryInView();