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

INTEGRATION: CWS m56fixp1 (1.16.4); FILE MERGED

Browse source 
2004/10/12 09:33:29 gh 1.16.4.1: #i34933#,#i34764# fiddeling around with recovering toolboxes again
This commit is contained in:
Jens-Heiner Rechtien 2004-10-12 08:56:14 +00:00
parent 19e9007547
commit 7a8eef7780
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
automation/source/server/statemnt.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: statemnt.cxx,v $ * $RCSfile: statemnt.cxx,v $
* *
* $Revision: 1.16 $ * $Revision: 1.17 $
* *
* last change: $Author: rt $ $Date: 2004-09-20 12:25:12 $ * last change: $Author: hr $ $Date: 2004-10-12 09:56:14 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -2320,9 +2320,9 @@ Window* StatementCommand::GetNextRecoverWin()
pControl = GetNextOverlap( pBase ); pControl = GetNextOverlap( pBase );
if ( pControl && pControl->IsVisible() && !IsFirstDocFrame( pControl ) && !IsIMEWin( pControl ) ) if ( pControl && pControl->IsVisible() && !IsFirstDocFrame( pControl ) && !IsIMEWin( pControl ) )
{ {
Window *pDock = GetWinByRT( pControl, WINDOW_TOOLBOX, FALSE ); Window* pTB = pControl->GetChild( 0 );
if ( pDock && pDock->GET_REAL_PARENT() == pControl ) if ( pControl->GetChildCount() == 1 && pTB->GetType() == WINDOW_TOOLBOX )
return pDock; return pTB;
else else
return pControl; return pControl;
} }
@ -2547,7 +2547,7 @@ BOOL StatementCommand::Execute()
{ {
if ( (((DockingWindow*)pControl)->GetStyle() | ((DockingWindow*)pControl)->GetFloatStyle()) & WB_CLOSEABLE ) if ( (((DockingWindow*)pControl)->GetStyle() | ((DockingWindow*)pControl)->GetFloatStyle()) & WB_CLOSEABLE )
{ {
REPORT_WIN_CLOSEDc(pControl, "DockingWindow"); REPORT_WIN_CLOSED(pControl, TypeString(pControl->GetType()));
SET_WINP_CLOSING(pControl); SET_WINP_CLOSING(pControl);
((DockingWindow*)pControl)->Close(); ((DockingWindow*)pControl)->Close();