diff options
| author | Mathias Bauer <mba@openoffice.org> | 2000-10-23 11:04:49 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2000-10-23 11:04:49 +0000 |
| commit | 61595728e49d99c94ee04b88603e9aedf563422c (patch) | |
| tree | ae12ef392d32001ab9e22321211dc127ebfb6e5c /sfx2 | |
| parent | 55d9d2e5aaa28d18badbc193c30a4a7d87d6a2e8 (diff) | |
Be aware of TopFrames without SystemWindows
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 63868dd62541..5f61864e1ce9 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfrm.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mba $ $Date: 2000-10-19 17:05:45 $ + * last change: $Author: mba $ $Date: 2000-10-23 12:04:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -3193,9 +3193,12 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) if ( pTop ) { WorkWindow* pWork = (WorkWindow*) pTop->GetTopFrame_Impl()->GetTopWindow_Impl(); - BOOL bNewFullScreenMode = pItem ? pItem->GetValue() : !pWork->IsFullScreenMode(); - pWork->ShowFullScreenMode( bNewFullScreenMode ); - pWork->SetMenuBarMode( bNewFullScreenMode ? MENUBAR_MODE_HIDE : MENUBAR_MODE_NORMAL ); + if ( pWork ) + { + BOOL bNewFullScreenMode = pItem ? pItem->GetValue() : !pWork->IsFullScreenMode(); + pWork->ShowFullScreenMode( bNewFullScreenMode ); + pWork->SetMenuBarMode( bNewFullScreenMode ? MENUBAR_MODE_HIDE : MENUBAR_MODE_NORMAL ); + } } GetDispatcher()->Update_Impl( TRUE ); @@ -3236,10 +3239,14 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) if ( pTop ) { WorkWindow* pWork = (WorkWindow*) pTop->GetTopFrame_Impl()->GetTopWindow_Impl(); - rSet.Put( SfxBoolItem( nWhich, pWork->IsFullScreenMode() ) ); + if ( pWork ) + { + rSet.Put( SfxBoolItem( nWhich, pWork->IsFullScreenMode() ) ); + break; + } } - else - rSet.DisableItem( nWhich ); + + rSet.DisableItem( nWhich ); break; } |