summaryrefslogtreecommitdiffstats
path: root/framework/source/layoutmanager/toolbarlayoutmanager.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-23 13:34:02 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-23 14:22:44 +0000
commitcc39a4b7d131c697d8f207da3acc4bba93cdd5cc (patch)
treeef90631cee6ab2485fa676744d36cc21c17a3695 /framework/source/layoutmanager/toolbarlayoutmanager.cxx
parentcoverity#704644 Dereference after null check (diff)
downloadcore-cc39a4b7d131c697d8f207da3acc4bba93cdd5cc.tar.gz
core-cc39a4b7d131c697d8f207da3acc4bba93cdd5cc.zip
coverity#704647 Dereference after null check
Change-Id: Ifc74e903f13e6065c507d9a90825e588c5e88a42
Diffstat (limited to 'framework/source/layoutmanager/toolbarlayoutmanager.cxx')
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index e495407495b1..9566a414fd62 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -744,9 +744,9 @@ bool ToolbarLayoutManager::dockToolbar( const OUString& rResourceURL, ui::Dockin
SolarMutexGuard aGuard;
{
- if ( pToolBox )
+ if (pToolBox)
aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ) );
- else
+ else if (pWindow)
aSize = pWindow->GetSizePixel();
}