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

[Caolán McNamara]

 framework/source/services/backingcomp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6446447603daa51620bfc04be5cd0de5781c6aa7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 4 13:53:26 2010 +0000

    Resolves: rhbz#659947 make this more robust
    (cherry picked from commit 82ef4d5f0bfd009bb28392b50ce109936f879a36)

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