summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorAron Budea <aron.budea@collabora.com>2020-12-09 18:39:54 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-12-11 10:56:12 +0100
commitd0f3639a5a91ff69e5a0c8883cabb8558803ec85 (patch)
tree2c84ee9a0401de8829364d4d49b5bc8acb440e8f /sfx2
parent2e6ecdfec95ac18a197cf31a67455cd103b73198 (diff)
tdf#138762: crash when trying to open sidebar w chart in Writer
In Writer when in chart edit mode, and the chart is deselected, the object selection remains. Opening Properties sidebar at this point crashed. Calc and Impress were unaffected. Regression from b5fdb148fe87a90f3e586efcea7aa6ef865fa42a Change-Id: I356c3a42c41dd38e4739df27c72c6d67722b1dbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107500 Tested-by: Jenkins Reviewed-by: Aron Budea <aron.budea@collabora.com> (cherry picked from commit 7e5991dc695d1e590483615c2907811ce4117834) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107543 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx11
1 files changed, 7 insertions, 4 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 08606a83f9dc..68066f4f4918 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -611,10 +611,13 @@ void SidebarController::OpenThenToggleDeck (
SwitchToDeck(rsDeckId);
// Make sure the sidebar is wide enough to fit the requested content
- sal_Int32 nRequestedWidth = (mpCurrentDeck->GetMinimalWidth() + TabBar::GetDefaultWidth())
- * mpTabBar->GetDPIScaleFactor();
- if (mnSavedSidebarWidth < nRequestedWidth)
- SetChildWindowWidth(nRequestedWidth);
+ if (mpCurrentDeck && mpTabBar)
+ {
+ sal_Int32 nRequestedWidth = (mpCurrentDeck->GetMinimalWidth() + TabBar::GetDefaultWidth())
+ * mpTabBar->GetDPIScaleFactor();
+ if (mnSavedSidebarWidth < nRequestedWidth)
+ SetChildWindowWidth(nRequestedWidth);
+ }
collectUIInformation(rsDeckId);
}