[openoffice.org/f14/master: 1/2] Resolves: rhbz659947 Crash in framework

[Caolan McNamara]

commit 87c2fa068c1b59823a217448da6bc250eeaf4ef5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 4 13:55:46 2010 +0000

    Resolves: rhbz659947 Crash in framework

 ...esolves-rhbz-659947-make-this-more-robust.patch |   25 ++++++++++++++++++++
 openoffice.org.spec                                |    5 +++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-659947-make-this-more-robust.patch b/0001-Resolves-rhbz-659947-make-this-more-robust.patch
new file mode 100644
index 0000000..a29b36a
--- /dev/null
+++ b/0001-Resolves-rhbz-659947-make-this-more-robust.patch
@@ -0,0 +1,25 @@
+From 82ef4d5f0bfd009bb28392b50ce109936f879a36 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Sat, 4 Dec 2010 13:53:26 +0000
+Subject: [PATCH 1/1] Resolves: rhbz#659947 make this more robust
+
+---
+ framework/source/services/backingcomp.cxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
+index 9970acf..3ed5d74 100644
+--- a/framework/source/services/backingcomp.cxx
++++ b/framework/source/services/backingcomp.cxx
+@@ -499,7 +499,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
+     Window*     pWindow = VCLUnoHelper::GetWindow(m_xWindow);
+ 
+     // disable full screen mode of the frame!
+-    if (pParent->IsFullScreenMode())
++    if (pParent && pParent->IsFullScreenMode())
+     {
+         pParent->ShowFullScreenMode(FALSE);
+         pParent->SetMenuBarMode(MENUBAR_MODE_NORMAL);
+-- 
+1.7.3.2
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index b6d1a46..7c0d6d5 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -146,6 +146,7 @@ Patch62: 0001-destroydesktop.in.timeout.patch
 Patch63: openoffice.org-3.3.0.rhbz657541.join-paragraphs.patch
 Patch64: 0001-Resolves-rhbz-657628-divide-by-zero.patch
 Patch65: 0001-Resolves-rhbz-657718-Crash-in-SwObjectFormatterTxtFr.patch
+Patch66: 0001-Resolves-rhbz-659947-make-this-more-robust.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1708,6 +1709,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch63 -p1 -b .rhbz657541.join-paragraphs.patch
 %patch64 -p1 -b .rhbz657628-divide-by-zero.patch
 %patch65 -p1 -b .rhbz657718-Crash-in-SwObjectFormatterTxtFr.patch
+%patch66 -p1 -b .rhbz659947-make-this-more-robust.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3904,8 +3906,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
-* Tue Nov 30 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-17.3-UNBUILT
+* Sat Dec 04 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-17.3-UNBUILT
 - Resolves: rhbz657718 Crash in SwObjectFormatterTxtFrm
+- Resolves: rhbz659947 Crash in framework
 
 * Sat Nov 27 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-17.2
 - Resolves: rhbz#657541 don't crash during processing of auto. styles