Resolves: rhbz#676539 handle missing pWindows from xWindows

0001-Resolves-rhbz-676539-handle-missing-pWindows-from-xW.patch

@@ -0,0 +1,44 @@
+From 9745fccacaa88bded763cc31c9aa7c04a5186a48 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Thu, 10 Feb 2011 09:51:46 +0000
+Subject: [PATCH] Resolves: rhbz#676539 handle missing pWindows from xWindows
+
+---
+ 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 a67c71d..2905f03 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();
+-- 
+1.7.4
+

libreoffice.spec

@@ -113,6 +113,7 @@ Patch25: vbahelper.visibility.patch
 Patch26: 0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch
 Patch27: 0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch 
 Patch28: 0001-Resolves-rhbz-670020-crash-in-slidesorting.patch
+Patch29: 0001-Resolves-rhbz-676539-handle-missing-pWindows-from-xW.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -744,6 +745,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch26 -p1 -b .fdo33509-i62414-out-by-one-breaks-CTL-spel.patch
 %patch27 -p1 -b .rhbz673819-crash-on-changing-position-of-d.patch 
 %patch28 -p1 -b .rhbz670020-crash-in-slidesorting.patch
+%patch29 -p1 -b .rhbz676539-handle-missing-pWindows-from-xW.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -2089,12 +2091,13 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
-* Wed Feb 02 2011 Caolán McNamara <caolanm@redhat.com> 3.3.0.4-3
+* Thu Feb 10 2011 Caolán McNamara <caolanm@redhat.com> 3.3.0.4-3
 - Related: rhbz#610103 make this even more robust
 - Related: rhbz#672872 cancel gtk file dialog on terminate
 - Resolves: fdo#33509/ooo#62414 fix CTL spelling popup
 - Resolves: rhbz#673819 crash on changing position of header/footer object
 - Resolves: rhbz#670020 crash in slidesorting
+- Resolves: rhbz#676539 handle missing pWindows from xWindows
 
 * Mon Jan 24 2011 Caolán McNamara <caolanm@redhat.com> 3.3.0.4-2
 - Resolves: rhbz#671540 fix lonely )