Revert "tdf#49684 Don't focus on Navigator or Sidebar on show"

See tdf#122900 for unwanted behavior changed caused by this. 

This reverts commit 88cbc3ea.

Change-Id: I9451a4b1f059b40d33b66b06f23228fc64170d8d
Reviewed-on: https://gerrit.libreoffice.org/67853
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>

sfx2/source/dialog/navigat.cxx

@@ -43,7 +43,6 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* pParentWnd ,
 
     static_cast<SfxDockingWindow*>( GetWindow() )->Initialize( pInfo );
     SetHideNotDelete( true );
-    Show( ShowFlags::NoFocusChange );
 }
 
 SfxNavigator::SfxNavigator( SfxBindings* pBind ,

sfx2/source/sidebar/SidebarChildWindow.cxx

@@ -60,7 +60,7 @@ SidebarChildWindow::SidebarChildWindow (vcl::Window* pParentWindow, sal_uInt16 n
     }
     SetHideNotDelete(true);
 
-    GetWindow()->Show(true, ShowFlags::NoFocusChange);
+    GetWindow()->Show();
 }
 
 sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window const * pWindow)

sw/source/uibase/utlui/navipi.cxx

@@ -739,7 +739,10 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
                     pActView->GetWrtShellPtr()->IsGlblDocSaveLinks());
         if (m_pConfig->IsGlobalActive())
             ToggleTree();
+        m_aGlobalTree->GrabFocus();
     }
+    else
+        m_aContentTree->GrabFocus();
     UsePage();
     m_aPageChgIdle.SetInvokeHandler(LINK(this, SwNavigationPI, ChangePageHdl));
     m_aPageChgIdle.SetPriority(TaskPriority::LOWEST);