summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-12-15 14:51:47 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-12-15 18:12:51 +0100
commitd2055db8d7b13b34e526cc16f5c084505e6de331 (patch)
treef565bf7000cbf84a7564b47f6e461268be1b4baf /sfx2/source
parent52cd017ced6ef0c28c53f2598a5bf65308132f77 (diff)
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@redhat.com>
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx4
1 files changed, 2 insertions, 2 deletions
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 (