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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 0bbdf06fabfc7f43dde9cc36256130779b1e3902
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: Wed Dec 16 09:42:08 2020 +0100

    tdf#138935 rsDeckId is invalid by the time collectUIInformation is called
    
    Change-Id: I4afc1ed1bbbfbbd510617a51b9aa6d627471d80d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107773
    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 3d894a97b124..83dbd0e561f4 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -615,6 +615,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
@@ -625,8 +627,6 @@ void SidebarController::OpenThenToggleDeck (
         if (mnSavedSidebarWidth < nRequestedWidth)
             SetChildWindowWidth(nRequestedWidth);
     }
-
-    collectUIInformation(rsDeckId);
 }
 
 void SidebarController::OpenThenSwitchToDeck (