diff options
| author | Mathias Bauer <mba@openoffice.org> | 2000-10-12 16:15:11 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2000-10-12 16:15:11 +0000 |
| commit | 2427651a1d2588418dfed538d34137828852192a (patch) | |
| tree | 5eb074b49bd140728fa7bf93d8cdf714771b2338 /sfx2 | |
| parent | 79adc282f966e7bf6f08caf4ffa46e99e620ec0e (diff) | |
#79440#: DoClose must be aware of having no ViewFrame
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/frame.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index df4703d2d4e1..6d16cd9adc1a 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frame.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mba $ $Date: 2000-10-09 10:39:46 $ + * last change: $Author: mba $ $Date: 2000-10-12 17:15:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -327,8 +327,7 @@ sal_Bool SfxFrame::DoClose() // leider nicht auf dem MAC Window *pWin = NULL; SfxViewShell *pViewSh; - if ( pImp->pCurrentViewFrame && - 0 != ( pViewSh = pImp->pCurrentViewFrame->GetViewShell() ) ) + if ( pImp->pCurrentViewFrame && 0 != ( pViewSh = pImp->pCurrentViewFrame->GetViewShell() ) ) { pWin = pViewSh->GetWindow(); if ( pWin ) @@ -351,7 +350,8 @@ sal_Bool SfxFrame::DoClose() DELETEZ( pImp->pWorkWin ); } - bRet = pImp->pCurrentViewFrame->Close(); + if ( pImp->pCurrentViewFrame ) + bRet = pImp->pCurrentViewFrame->Close(); if ( pImp->bOwnsBindings ) delete pBindings; |