[openoffice.org/f14/master] Related: rhbz#666216 make this more robust

[Caolan McNamara]

commit 1d22aa22e3a3a38ccad6d44fd7ff7f8f056c32ed
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 29 20:26:22 2010 +0000

    Related: rhbz#666216 make this more robust

 ...esolves-rhbz-659947-make-this-more-robust.patch |   26 ++++++++++---------
 1 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/0001-Resolves-rhbz-659947-make-this-more-robust.patch b/0001-Resolves-rhbz-659947-make-this-more-robust.patch
index a29b36a..beacb30 100644
--- a/0001-Resolves-rhbz-659947-make-this-more-robust.patch
+++ b/0001-Resolves-rhbz-659947-make-this-more-robust.patch
@@ -1,12 +1,3 @@
-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
@@ -20,6 +11,17 @@ index 9970acf..3ed5d74 100644
      {
          pParent->ShowFullScreenMode(FALSE);
          pParent->SetMenuBarMode(MENUBAR_MODE_NORMAL);
--- 
-1.7.3.2
-
+@@ -522,8 +522,11 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
+         xLayoutManager->unlock();
+     }        
+ 
+-    // set help ID for our canvas
+-    pWindow->SetHelpId(HID_BACKINGWINDOW);
++    if (pWindow)
++    {
++        // set help ID for our canvas
++        pWindow->SetHelpId(HID_BACKINGWINDOW);
++    }
+     
+     // inform BackingWindow about frame
+     BackingWindow* pBack = dynamic_cast<BackingWindow*>(pWindow );