summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-29 09:14:02 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-10-29 10:40:08 +0000
commita15298812622bd29f10c4ff04994ca162089c4ae (patch)
treeb1800832f8f7993b4e023ba875425199f79d0a22 /sfx2/source
parent836023dedc36cbfe946c42d629ece34174c6bd2b (diff)
coverity#1028106 Dereference before null check
Change-Id: I77a910542cf1b7889f69a1d3b7989779d9ecc7e8
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx16
1 files changed, 0 insertions, 16 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 2da9d4863a40..d8668186fcf3 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -92,7 +92,6 @@ namespace {
static const char gsDefaultDeckId[] = "PropertyDeck";
}
-
SidebarController::SidebarController (
SidebarDockingWindow* pParentWindow,
const css::uno::Reference<css::frame::XFrame>& rxFrame)
@@ -124,12 +123,6 @@ SidebarController::SidebarController (
mnWidthOnSplitterButtonDown(0),
mpCloseIndicator()
{
- if (pParentWindow == NULL)
- {
- OSL_ASSERT(pParentWindow!=NULL);
- return;
- }
-
// Listen for context change events.
css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
css::ui::ContextChangeEventMultiplexer::get(
@@ -163,16 +156,10 @@ SidebarController::SidebarController (
xWeakController));
}
-
-
-
SidebarController::~SidebarController (void)
{
}
-
-
-
SidebarController* SidebarController::GetSidebarControllerForFrame (
const css::uno::Reference<css::frame::XFrame>& rxFrame)
{
@@ -187,9 +174,6 @@ SidebarController* SidebarController::GetSidebarControllerForFrame (
return dynamic_cast<SidebarController*>(xController.get());
}
-
-
-
void SAL_CALL SidebarController::disposing (void)
{
SidebarControllerContainer::iterator iEntry (maSidebarControllerContainer.find(mxFrame));