summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-12-04 13:53:26 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-12-04 13:59:08 +0000
commit6446447603daa51620bfc04be5cd0de5781c6aa7 (patch)
tree051813b61a568b91814e4343f2558cf4fe44ec61
parent969cac7c1792f3a22f589db1baff3919a90820d5 (diff)
Resolves: rhbz#659947 make this more robust
(cherry picked from commit 82ef4d5f0bfd009bb28392b50ce109936f879a36)
-rw-r--r--framework/source/services/backingcomp.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index add54b5e66..2242d845ef 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);