[Libreoffice-commits] core.git: sfx2/source

[Trent MacAlpine]

 sfx2/source/sidebar/SidebarController.cxx |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 592984cea1a9cc545358b8d6077113a658834aa5
Author: Trent MacAlpine <tmacalp at gmail.com>
Date:   Sun Jan 18 13:32:16 2015 -0500

    fdo#88241 Floating sidebar second call to same item should dismiss it
    
    Note that this was written to be used in combination with
    commit 304e2002a053e9eb54e36462165eca831da8aeb2 to give back the
    behavior of calling and dismissing the styles and formatting dialog.
    
    Change-Id: Ic05db180425b0a2dcd05774b6fa0227b01464731
    Reviewed-on: https://gerrit.libreoffice.org/13980
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 60b61c4..b8a8733 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -489,8 +489,17 @@ void SidebarController::OpenThenSwitchToDeck (
     // fdo#67627 Clicking a second time on a Deck icon will close the Deck
     if (IsDeckVisible(rsDeckId))
     {
-        RequestCloseDeck();
-        return;
+        // fdo#88241 Summoning an undocked sidebar a second time should close sidebar
+        if (!GetSplitWindow())
+        {
+            mpParentWindow->Close();
+            return;
+        }
+        else
+        {
+            RequestCloseDeck();
+            return;
+        }
     }
     RequestOpenDeck();
     SwitchToDeck(rsDeckId);