sfx2/source/dialog/navigat.cxx | 1 + sfx2/source/sidebar/SidebarChildWindow.cxx | 2 +- sw/source/uibase/utlui/navipi.cxx | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-)
New commits: commit 88cbc3ea2db8358bbedff01361f95f972f2b0231 Author: Jim Raykowski <[email protected]> AuthorDate: Mon Oct 22 17:38:31 2018 -0800 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Thu Nov 1 10:34:45 2018 +0100 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 <[email protected]> diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 2c0e974e62de..d80d656ffd29 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -42,6 +42,7 @@ 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 7153c1d461b1..9c96f17ccf5b 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(); + GetWindow()->Show(true, ShowFlags::NoFocusChange); } 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 0a59be1f9bb1..cc6d60dcc06e 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -740,10 +740,7 @@ 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); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
