commit 0bbdf06fabfc7f43dde9cc36256130779b1e3902
author Caolán McNamara <caolanm@redhat.com> Tue Dec 15 14:51:47 2020 +0000
committer Caolán McNamara <caolanm@redhat.com> Wed Dec 16 09:42:08 2020 +0100
tree bc1c653394b8cfda4cf585f1efa0a1ca3d1d94fc
parent 0eb8fd225e16b9bb810fc3574085a2c7914df2b6

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@redhat.com>

sfx2/source/sidebar/SidebarController.cxx

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 3d894a9..83dbd0e 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 (