[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source

[Aron Budea (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 4aa9cb784469b8c13660f36c829c0fadc11c922b
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Wed Dec 9 18:39:54 2020 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Fri Dec 11 11:03:42 2020 +0100

    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 at collabora.com>
    (cherry picked from commit 7e5991dc695d1e590483615c2907811ce4117834)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107542

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 5b13e599afb1..9c5ebda77897 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -630,10 +630,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);
 }