[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-2' - sfx2/source sw/source

[Libreoffice Gerrit user]

 sfx2/source/dialog/navigat.cxx             |    1 -
 sfx2/source/sidebar/SidebarChildWindow.cxx |    2 +-
 sw/source/uibase/utlui/navipi.cxx          |    3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c58bc517af4a8c8aabace4b65d6503670ba2ba43
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Fri Feb 15 08:07:49 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Mar 15 18:35:50 2019 +0100

    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 88cbc3ea2db8358bbedff01361f95f972f2b0231.
    
    Change-Id: I9451a4b1f059b40d33b66b06f23228fc64170d8d
    Reviewed-on: https://gerrit.libreoffice.org/67853
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>
    (cherry picked from commit 5a557821c647c1a499270a8a1188e23fc015f782)
    Reviewed-on: https://gerrit.libreoffice.org/69087
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 35074dc5518e59284663ce85496b3cda406a25eb)
    Reviewed-on: https://gerrit.libreoffice.org/69129
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index d80d656ffd29..2c0e974e62de 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -42,7 +42,6 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* pParentWnd ,
 
     static_cast<SfxDockingWindow*>( GetWindow() )->Initialize( pInfo );
     SetHideNotDelete( true );
-    Show( ShowFlags::NoFocusChange );
 }
 
 SfxNavigator::SfxNavigator( SfxBindings* pBind ,
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 9c96f17ccf5b..7153c1d461b1 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/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)
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index d27bf4e1ddfa..5b76d1168254 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -740,7 +740,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);