31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
|
--- framework/source/layoutmanager/layoutmanager.cxx 2010-11-11 20:08:59.000000000 +0100
|
||
|
|
+++ framework/source/layoutmanager/layoutmanager.cxx-gil 2011-03-03 15:12:49.000000000 +0100
|
||
|
|
@@ -130,13 +130,13 @@
|
||
|
|
_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;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -1008,9 +1008,9 @@
|
||
|
|
// 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();
|