diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-02-10 09:51:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-02-10 09:52:56 +0000 |
| commit | 9745fccacaa88bded763cc31c9aa7c04a5186a48 (patch) | |
| tree | 40580065fbe3cd63ed32d96a024a3fb5d43b87a2 /framework | |
| parent | 8366378563baef5070bc86c2f85ac1937c520551 (diff) | |
Resolves: rhbz#676539 handle missing pWindows from xWindows
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index a67c71d6e0..2905f030ea 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -130,13 +130,13 @@ bool lcl_checkUIElement(const Reference< XUIElement >& xUIElement,css::awt::Rect _rPosSize = _xWindow->getPosSize(); Window* pWindow = VCLUnoHelper::GetWindow( _xWindow ); - if ( pWindow->GetType() == WINDOW_TOOLBOX ) + if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { ::Size aSize = ((ToolBox*)pWindow)->CalcWindowSizePixel( 1 ); _rPosSize.Width = aSize.Width(); _rPosSize.Height = aSize.Height(); } - } // if ( xUIElement.is() ) + } return bRet; } @@ -1007,9 +1007,9 @@ void LayoutManager::implts_createAddonsToolBars() // Set generic title for add-on toolbar SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); - if ( pWindow->GetText().Len() == 0 ) + if ( pWindow && pWindow->GetText().Len() == 0 ) pWindow->SetText( aGenericAddonTitle ); - if ( pWindow->GetType() == WINDOW_TOOLBOX ) + if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { ToolBox* pToolbar = (ToolBox *)pWindow; pToolbar->SetMenuType(); |