diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 08:56:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 08:56:14 +0000 |
| commit | 7a8eef7780d6e8e4919ebccdb074d8ce4e318d61 (patch) | |
| tree | e2a29a7fd859c372a60c75d894d13468c3def371 /automation/source | |
| parent | 19e900754787575f220230f60aa84c6f5774b915 (diff) | |
INTEGRATION: CWS m56fixp1 (1.16.4); FILE MERGED
2004/10/12 09:33:29 gh 1.16.4.1: #i34933#,#i34764# fiddeling around with recovering toolboxes again
Diffstat (limited to 'automation/source')
| -rw-r--r-- | automation/source/server/statemnt.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 72890faf46a1..e4f5a2a97183 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -2,9 +2,9 @@ * * $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 * either of the following licenses @@ -2320,9 +2320,9 @@ Window* StatementCommand::GetNextRecoverWin() pControl = GetNextOverlap( pBase ); if ( pControl && pControl->IsVisible() && !IsFirstDocFrame( pControl ) && !IsIMEWin( pControl ) ) { - Window *pDock = GetWinByRT( pControl, WINDOW_TOOLBOX, FALSE ); - if ( pDock && pDock->GET_REAL_PARENT() == pControl ) - return pDock; + Window* pTB = pControl->GetChild( 0 ); + if ( pControl->GetChildCount() == 1 && pTB->GetType() == WINDOW_TOOLBOX ) + return pTB; else return pControl; } @@ -2547,7 +2547,7 @@ BOOL StatementCommand::Execute() { 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); ((DockingWindow*)pControl)->Close(); |