strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS fwkpostbeta1 (1.94.24); FILE MERGED

Browse source 
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
This commit is contained in:
Kurt Zenker 2005-03-21 12:42:57 +00:00
parent e78fed244c
commit 46f3bd26cc
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sfx2/source/appl/app.cxx
View file

@ -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() )