[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 871940eba642bec3cc263b48048ee4ffbf8a6c0f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Dec 15 14:51:47 2020 +0000
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu Dec 17 13:49:50 2020 +0100

    tdf#138935 rsDeckId is invalid by the time collectUIInformation is called
    
    Change-Id: I4afc1ed1bbbfbbd510617a51b9aa6d627471d80d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107706
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 68066f4f4918..b890f9950f56 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -608,6 +608,8 @@ void SidebarController::OpenThenToggleDeck (
         }
     }
     RequestOpenDeck();
+    // before SwitchToDeck which may cause the rsDeckId string to be released
+    collectUIInformation(rsDeckId);
     SwitchToDeck(rsDeckId);
 
     // Make sure the sidebar is wide enough to fit the requested content
@@ -618,8 +620,6 @@ void SidebarController::OpenThenToggleDeck (
         if (mnSavedSidebarWidth < nRequestedWidth)
             SetChildWindowWidth(nRequestedWidth);
     }
-
-    collectUIInformation(rsDeckId);
 }
 
 void SidebarController::OpenThenSwitchToDeck (