summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-12-29 20:23:41 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-12-29 21:00:15 +0000
commit1d5ea739d48df24c475a70292d17170e71140ea6 (patch)
tree21fdde4776f13da352fa1008aaffe10677a05de5
parentb4533051a5b364470be0a2f0ee461f45419a836d (diff)
Resolves: rhbz#666216 survive missing window
(cherry picked from commit e9438320b50e647f6c5bf052148bcd501b7b55d4)
-rw-r--r--framework/source/services/backingcomp.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 2242d845ef..5698f863cc 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 );