summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-12 10:29:28 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-12 11:02:17 +0000
commit17b0d011dafb5053fe8de2819d00ff746798bd77 (patch)
tree7cad3375e412dd827c168d3c5a74d1e1324315b0 /sfx2
parentf51f202f24fc116c4d39beaa4a3ba94b8200b113 (diff)
coverity#1027775 Dereference null return value
Change-Id: I27dc7645969e6311bc6c0a3d593924ea41dfdf5d
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx12
1 files changed, 9 insertions, 3 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index ee839fc90c7f..39b548881985 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -496,9 +496,15 @@ void SidebarController::UpdateConfigurations (void)
// with the deck.
mpTabBar->HighlightDeck(sNewDeckId);
- SwitchToDeck(
- *ResourceManager::Instance().GetDeckDescriptor(sNewDeckId),
- maCurrentContext);
+ const DeckDescriptor* pDescriptor =
+ ResourceManager::Instance().GetDeckDescriptor(sNewDeckId);
+
+ if (pDescriptor)
+ {
+ SwitchToDeck(
+ *pDescriptor,
+ maCurrentContext);
+ }
}
}