coverity#704647 Dereference after null check

Change-Id: Ifc74e903f13e6065c507d9a90825e588c5e88a42
2014-02-23 13:34:02 +00:00 · 2014-02-23 13:34:02 +00:00 · cc39a4b7d1
commit cc39a4b7d1
parent 2a83910e72
1 changed files with 2 additions and 2 deletions
--- 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();
                        }