[Libreoffice-commits] .: Branch 'libreoffice-3-3' - framework/source

[Caolán McNamara]

 framework/source/services/backingcomp.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 1d5ea739d48df24c475a70292d17170e71140ea6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 29 20:23:41 2010 +0000

    Resolves: rhbz#666216 survive missing window
    (cherry picked from commit e9438320b50e647f6c5bf052148bcd501b7b55d4)

diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 2242d84..5698f86 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -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 );