diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-03 11:06:14 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-03 11:06:14 +0000 |
| commit | de94e889ff1f8f91684403e6358ed6953bb71a60 (patch) | |
| tree | f76fe5865eacadb7b4b9593dd44a1c2c724e1a56 /sfx2 | |
| parent | 20bbeba82064c4fb1ae6a6882b6f710191254229 (diff) | |
INTEGRATION: CWS fwk23 (1.61.126); FILE MERGED
2005/10/18 09:31:53 abi 1.61.126.2: RESYNC: (1.61-1.62); FILE MERGED
2005/08/25 10:05:25 mba 1.61.126.1: #i52257#: don't send OnUnload when ViewShell is switched inside a ViewFrame
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 2e34c0bbdd9f..b4a34a066e38 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sfxbasecontroller.cxx,v $ * - * $Revision: 1.62 $ + * $Revision: 1.63 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:29:56 $ + * last change: $Author: kz $ $Date: 2005-11-03 12:06:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1217,12 +1217,12 @@ void SAL_CALL SfxBaseController::dispose() throw( ::com::sun::star::uno::Runtime EVENTOBJECT aObject; aObject.Source = (OWEAKOBJECT*)this ; - // Bei Reload hat die alte ViewShell keinen Frame! SfxObjectShell* pDoc = pFrame->GetObjectShell() ; SfxViewFrame *pView = SfxViewFrame::GetFirst(pDoc); while( pView ) { - if ( pView != pFrame ) + // if there is another ViewFrame or currently the ViewShell in my ViewFrame is switched (PagePreview) + if ( pView != pFrame || pView->GetViewShell() != m_pData->m_pViewShell ) break; pView = SfxViewFrame::GetNext( *pView, pDoc ); } |