diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2019-02-15 08:07:49 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-03-12 19:13:31 +0100 |
| commit | 35074dc5518e59284663ce85496b3cda406a25eb (patch) | |
| tree | a8f363c7a14d22eef9aa7ea5ee39552f06fa8b00 /sfx2 | |
| parent | ab9d3c535800e972d893ebc6415d0f616a89316b (diff) | |
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>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/navigat.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarChildWindow.cxx | 2 |
2 files changed, 1 insertions, 2 deletions
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) |