diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-21 12:42:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-21 12:42:57 +0000 |
| commit | 46f3bd26cc94ae0656b21588f7c5f3789f4606d9 (patch) | |
| tree | 501ef11761b5164643a57ee5d57afb93fcf814cf /sfx2/source/appl/app.cxx | |
| parent | e78fed244c663b69fc6801c03eb4f15fbc52fbd5 (diff) | |
INTEGRATION: CWS fwkpostbeta1 (1.94.24); FILE MERGED
2005/02/17 20:15:29 abi 1.94.24.2: RESYNC: (1.94-1.95); FILE MERGED
2005/01/31 16:20:05 cd 1.94.24.1: #i40968# Don't set a current view frame when the active one is closed. Triggers focus problems with X window managers
Diffstat (limited to 'sfx2/source/appl/app.cxx')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 367e9d272a1e..e88fc945ccfe 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.95 $ + * $Revision: 1.96 $ * - * last change: $Author: rt $ $Date: 2005-02-02 14:01:24 $ + * last change: $Author: kz $ $Date: 2005-03-21 13:42:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -648,29 +648,6 @@ void SfxApplication::SetViewFrame( SfxViewFrame *pFrame ) if ( pFrame != pViewFrame ) { - if ( !pFrame && !bDowning ) - { - // activate any frame to avoid CurrentViewFrame == NULL - SfxFrameArr_Impl& rArr = *pAppData_Impl->pTopFrames; - for( sal_uInt16 nPos = rArr.Count(); nPos--; ) - { - SfxFrame* pCurFrame = rArr[ nPos ]; - SfxViewFrame* pView = pCurFrame->GetCurrentViewFrame(); - if ( pView && pView != pViewFrame ) - { - if ( !pView->GetViewShell() ) - { - DBG_ERROR("Attention: this bug is very hard to reproduce. Please try to remember how you triggered it!"); - } - else - { - pFrame = pView; - break; - } - } - } - } - // get the containerframes ( if one of the frames is an InPlaceFrame ) SfxViewFrame *pOldContainerFrame = pViewFrame; while ( pOldContainerFrame && pOldContainerFrame->GetParentViewFrame_Impl() ) |