[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sfx2/source

[Samuel Mehrbrodt (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit a643c1fa95899f89e2add8c7ae89eed7b4fca224
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Mon Jul 29 10:09:11 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Aug 13 10:21:06 2019 +0200

    Expand collapsed sidebar when calling XSidebarProvider::showDecks
    
    This UNO call did not work correctly when the sidebar was completely collapsed.
    
    Change-Id: I3de0b89d95aa81287c36911bbd52a9941d9886b3
    Reviewed-on: https://gerrit.libreoffice.org/76531
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 8142297c56f0..672dd305aadb 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -565,10 +565,6 @@ void SidebarController::OpenThenToggleDeck (
 void SidebarController::OpenThenSwitchToDeck (
     const OUString& rsDeckId)
 {
-    SfxSplitWindow* pSplitWindow = GetSplitWindow();
-    if ( pSplitWindow && !pSplitWindow->IsFadeIn() )
-        // tdf#83546 Collapsed sidebar should expand first
-        pSplitWindow->FadeIn();
     RequestOpenDeck();
     SwitchToDeck(rsDeckId);
 
@@ -1122,6 +1118,11 @@ void SidebarController::RequestCloseDeck()
 
 void SidebarController::RequestOpenDeck()
 {
+    SfxSplitWindow* pSplitWindow = GetSplitWindow();
+    if ( pSplitWindow && !pSplitWindow->IsFadeIn() )
+        // tdf#83546 Collapsed sidebar should expand first
+        pSplitWindow->FadeIn();
+
     mbIsDeckRequestedOpen = true;
     UpdateDeckOpenState();
 }