diff options
author | Trent MacAlpine <tmacalp@gmail.com> | 2015-01-18 01:11:32 -0500 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-20 13:49:59 +0000 |
commit | 915469e5f70b179f4219d8f981802fcc9d5e6959 (patch) | |
tree | 3266578f29744c68aae58684eb27581efd55a58e | |
parent | b81107be0d9c23c9ddf9ff6dbc8a521f92d6c3f3 (diff) |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sfx2/source/sidebar/SidebarDockingWindow.cxx | 13 |
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(); } |