From 7e5991dc695d1e590483615c2907811ce4117834 Mon Sep 17 00:00:00 2001 From: Aron Budea Date: Wed, 9 Dec 2020 18:39:54 +0100 Subject: [PATCH] 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 --- sfx2/source/sidebar/SidebarController.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 231524d1af9b..2430641aa2d7 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -628,10 +628,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); } -- 2.11.4.GIT