commit 88cbc3ea2db8358bbedff01361f95f972f2b0231
author Jim Raykowski <raykowj@gmail.com> Mon Oct 22 17:38:31 2018 -0800
committer Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Thu Nov 01 10:34:45 2018 +0100
tree 1237a5b1c0c1c7c0172ec1c1037f654d139a57c1
parent 27ea5f66c788443aef38cfc5378ec6410d722a9f

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

Change-Id: I21b36c3ed2e5b6fc574e00f86d2c48c352cf469c
Reviewed-on: https://gerrit.libreoffice.org/62337
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

sfx2/source/dialog/navigat.cxx

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

    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 7153c1d..9c96f17 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -60,7 +60,7 @@
    }
    SetHideNotDelete(true);

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

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 0a59be1..cc6d60d 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -740,10 +740,7 @@
                    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);