summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-12-09 11:09:21 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-12-09 11:14:53 +0000
commit5768416761756a386cba54314f783cb9c0d0d093 (patch)
tree8ec9108c2704e4452fe291e8f964e21c17dea060 /sfx2
parent987984ea21f1688eddfc124292f5e4b931d7d138 (diff)
Related: rhbz#1397939 crash with null pSidebarController
Change-Id: I7627ff30564b2de61669c71dafd15e7b1778b5c6 (cherry picked from commit f5edbb4158e86bfea7267115395b64e60fd61dc7)
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/Panel.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 8b2bb7bd67ca..b87d0ddb57e4 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,