[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sfx2/source

[Caolán McNamara]

 sfx2/source/sidebar/Panel.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3e60ccb74ac6589e14a479c6646c63a4e5ac4e35
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 9 11:09:21 2016 +0000

    Related: rhbz#1397939 crash with null pSidebarController
    
    Change-Id: I7627ff30564b2de61669c71dafd15e7b1778b5c6
    (cherry picked from commit f5edbb4158e86bfea7267115395b64e60fd61dc7)
    (cherry picked from commit 5768416761756a386cba54314f783cb9c0d0d093)
    Reviewed-on: https://gerrit.libreoffice.org/31787
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 9c05dde..d5c6b78 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -115,14 +115,14 @@ void Panel::SetUIElement (const Reference<ui::XUIElement>& rxElement)
 
 void Panel::SetExpanded (const bool bIsExpanded)
 {
-    SidebarController* pSidebarController= SidebarController::GetSidebarControllerForFrame(mxFrame);
+    SidebarController* pSidebarController = SidebarController::GetSidebarControllerForFrame(mxFrame);
 
     if (mbIsExpanded != bIsExpanded)
     {
         mbIsExpanded = bIsExpanded;
         maDeckLayoutTrigger();
 
-        if (maContextAccess)
+        if (maContextAccess && pSidebarController)
         {
             pSidebarController->GetResourceManager()->StorePanelExpansionState(
                 msPanelId,