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

[Caolán McNamara (via logerrit)]

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

New commits:
commit d2055db8d7b13b34e526cc16f5c084505e6de331
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Dec 15 14:51:47 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Dec 15 18:12:51 2020 +0100

    tdf#138935 rsDeckId is invalid by the time collectUIInformation is called
    
    Change-Id: I4afc1ed1bbbfbbd510617a51b9aa6d627471d80d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107705
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 9c5ebda77897..98c8acbc6c67 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -627,6 +627,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
@@ -637,8 +639,6 @@ void SidebarController::OpenThenToggleDeck (
         if (mnSavedSidebarWidth < nRequestedWidth)
             SetChildWindowWidth(nRequestedWidth);
     }
-
-    collectUIInformation(rsDeckId);
 }
 
 void SidebarController::OpenThenSwitchToDeck (