summaryrefslogtreecommitdiff
path: root/framework
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 20:56:16 +0000
commit813572c5d774a71a221eaa72f131100ed134c899 (patch)
treee7c5cbdab976e3cfc454a2064e3edc681376b1ca /framework
parent0a7bd33de162d4f3aca86f67b33dbd82e0a0b204 (diff)
Resolves: rhbz#666216 survive missing window
Diffstat (limited to 'framework')
-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 3ed5d742e8..98c468dfe4 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 );