|
 |
c823692 |
From 9745fccacaa88bded763cc31c9aa7c04a5186a48 Mon Sep 17 00:00:00 2001
|
|
|
c823692 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
c823692 |
Date: Thu, 10 Feb 2011 09:51:46 +0000
|
|
|
c823692 |
Subject: [PATCH] Resolves: rhbz#676539 handle missing pWindows from xWindows
|
|
|
c823692 |
|
|
|
c823692 |
---
|
|
|
c823692 |
framework/source/layoutmanager/layoutmanager.cxx | 8 ++++----
|
|
|
c823692 |
1 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
c823692 |
|
|
|
c823692 |
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
|
|
|
c823692 |
index a67c71d..2905f03 100644
|
|
|
c823692 |
--- a/framework/source/layoutmanager/layoutmanager.cxx
|
|
|
c823692 |
+++ b/framework/source/layoutmanager/layoutmanager.cxx
|
|
|
c823692 |
@@ -130,13 +130,13 @@ bool lcl_checkUIElement(const Reference< XUIElement >& xUIElement,css::awt::Rect
|
|
|
c823692 |
_rPosSize = _xWindow->getPosSize();
|
|
|
c823692 |
|
|
|
c823692 |
Window* pWindow = VCLUnoHelper::GetWindow( _xWindow );
|
|
|
c823692 |
- if ( pWindow->GetType() == WINDOW_TOOLBOX )
|
|
|
c823692 |
+ if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
|
|
|
c823692 |
{
|
|
|
c823692 |
::Size aSize = ((ToolBox*)pWindow)->CalcWindowSizePixel( 1 );
|
|
|
c823692 |
_rPosSize.Width = aSize.Width();
|
|
|
c823692 |
_rPosSize.Height = aSize.Height();
|
|
|
c823692 |
}
|
|
|
c823692 |
- } // if ( xUIElement.is() )
|
|
|
c823692 |
+ }
|
|
|
c823692 |
return bRet;
|
|
|
c823692 |
}
|
|
|
c823692 |
|
|
|
c823692 |
@@ -1007,9 +1007,9 @@ void LayoutManager::implts_createAddonsToolBars()
|
|
|
c823692 |
// Set generic title for add-on toolbar
|
|
|
c823692 |
SolarMutexGuard aGuard;
|
|
|
c823692 |
Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
|
|
|
c823692 |
- if ( pWindow->GetText().Len() == 0 )
|
|
|
c823692 |
+ if ( pWindow && pWindow->GetText().Len() == 0 )
|
|
|
c823692 |
pWindow->SetText( aGenericAddonTitle );
|
|
|
c823692 |
- if ( pWindow->GetType() == WINDOW_TOOLBOX )
|
|
|
c823692 |
+ if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
|
|
|
c823692 |
{
|
|
|
c823692 |
ToolBox* pToolbar = (ToolBox *)pWindow;
|
|
|
c823692 |
pToolbar->SetMenuType();
|
|
|
c823692 |
--
|
|
|
c823692 |
1.7.4
|
|
|
c823692 |
|