sfx2/source/sidebar/SidebarDockingWindow.cxx | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
New commits: commit 915469e5f70b179f4219d8f981802fcc9d5e6959 Author: Trent MacAlpine <[email protected]> Date: Sun Jan 18 01:11:32 2015 -0500 fdo#87217 Inconsistent floating sidebar close behavior fixed in master by commit# 304e2002a053e9eb54e36462165eca831da8aeb2 Remove code that caused an undocked sidebar to reenable a docked sidebar when you attempt to close it using the window manager. It should simply be closed instead. Change-Id: Iabf45d5f7e81408e2e18d2fbad817ab34a9f3549 Reviewed-on: https://gerrit.libreoffice.org/14025 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 1a39746..24206b1 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -88,19 +88,10 @@ void SidebarDockingWindow::GetFocus() +// fdo#87217 bool SidebarDockingWindow::Close (void) { - if (mpSidebarController.is()) - { - // Do not close the floating window. - // Dock it and close just the deck instead. - SetFloatingMode(false); - mpSidebarController->RequestCloseDeck(); - mpSidebarController->NotifyResize(); - return false; - } - else - return SfxDockingWindow::Close(); + return SfxDockingWindow::Close(); }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
