tdf#115786: Fix reopening undocked sidebar

while trying hard to keep tdf#88241 fixed. Had to introduce yet
another bool variable as now that previously active sidebar deck
is remembered (= it is visible when floating window opens) it's
impossible to tell whether sidebar was already opened or not

Change-Id: If2c9edfa2f9beb400537b106d3094f256b0cc183
Reviewed-on: https://gerrit.libreoffice.org/51866
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

1 files changed, 8 insertions, 2 deletions

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index ebe568093772..c7652bdf9e52 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -104,6 +104,7 @@ SidebarController::SidebarController (
       maAsynchronousDeckSwitch(),
       mbIsDeckRequestedOpen(),
       mbIsDeckOpen(),
+      mbFloatingDeckClosed(!pParentWindow->IsFloatingMode()),
       mnSavedSidebarWidth(pParentWindow->GetSizePixel().Width()),
       maFocusManager([this](const Panel& rPanel){ return this->ShowPanel(rPanel); }),
       mxReadOnlyModeDispatch(),
@@ -523,12 +524,17 @@ void SidebarController::OpenThenToggleDeck (
     else if ( IsDeckVisible( rsDeckId ) )
     {
         if ( pSplitWindow )
+        {
             // tdf#67627 Clicking a second time on a Deck icon will close the Deck
             RequestCloseDeck();
-        else
+            return;
+        }
+        else if( !WasFloatingDeckClosed() )
+        {
             // tdf#88241 Summoning an undocked sidebar a second time should close sidebar
             mpParentWindow->Close();
-        return;
+            return;
+        }
     }
     RequestOpenDeck();
     SwitchToDeck(rsDeckId);