fdo#87217 Inconsistent floating sidebar close behavior

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: Ib058d167b6c89f42df3ce4c80e4d97435b31c31d
Reviewed-on: https://gerrit.libreoffice.org/13979
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>

1 files changed, 2 insertions, 11 deletions

diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 1a39746f810d..24206b160e85 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();
 }