commit 871940eba642bec3cc263b48048ee4ffbf8a6c0f
author Caolán McNamara <caolanm@redhat.com> Tue Dec 15 14:51:47 2020 +0000
committer Xisco Fauli <xiscofauli@libreoffice.org> Thu Dec 17 13:49:50 2020 +0100
tree a52d4db6c8a331a0584a128d23f3b44640c5f30f
parent a10c7ec17fe57c0367ce5a4cbefd89e8b63e069b

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@libreoffice.org>

sfx2/source/sidebar/SidebarController.cxx

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 68066f4..b890f99 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 (