commit c58bc517af4a8c8aabace4b65d6503670ba2ba43
author Jim Raykowski <raykowj@gmail.com> Fri Feb 15 08:07:49 2019 +0100
committer Thorsten Behrens <Thorsten.Behrens@CIB.de> Fri Mar 15 18:35:50 2019 +0100
tree c0446a7c5eddbe63d4a2b354fb485526f122513d
parent b71f54527a08eedf91b4268f280816a45928737a

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@gmail.com>
(cherry picked from commit 5a557821c647c1a499270a8a1188e23fc015f782)
Reviewed-on: https://gerrit.libreoffice.org/69087
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 35074dc5518e59284663ce85496b3cda406a25eb)
Reviewed-on: https://gerrit.libreoffice.org/69129
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

sfx2/source/dialog/navigat.cxx

diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index d80d656..2c0e974 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -42,7 +42,6 @@

    static_cast<SfxDockingWindow*>( GetWindow() )->Initialize( pInfo );
    SetHideNotDelete( true );
    Show( ShowFlags::NoFocusChange );
}

SfxNavigator::SfxNavigator( SfxBindings* pBind ,

sfx2/source/sidebar/SidebarChildWindow.cxx

diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 9c96f17..7153c1d 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -60,7 +60,7 @@
    }
    SetHideNotDelete(true);

    GetWindow()->Show(true, ShowFlags::NoFocusChange);
    GetWindow()->Show();
}

sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window const * pWindow)

sw/source/uibase/utlui/navipi.cxx

diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index d27bf4e..5b76d11 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -740,7 +740,10 @@
                    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);