diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 14:48:17 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 14:48:17 +0000 |
| commit | d6f24dd8b21a4cb44c58fc9ed303e26635743c2b (patch) | |
| tree | 216f54c3112dc79bac539c117a28e13c356c8734 /automation | |
| parent | 48bcca54be2577616af8cadf80adc87133ba737c (diff) | |
INTEGRATION: CWS gh10 (1.19.4); FILE MERGED
2005/03/22 11:24:06 gh 1.19.4.2: #i45662# use GetPreferredKeyInputWindow to find preferred inpuzwindow
2004/12/22 13:14:52 gh 1.19.4.1: #i38796# do not close ToolBars on ResetApplication
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/source/server/statemnt.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index d15de445ca81..a79a957f2973 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: statemnt.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2005-01-13 17:21:40 $ + * last change: $Author: vg $ $Date: 2005-03-23 15:48:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2322,7 +2322,8 @@ Window* StatementCommand::GetNextRecoverWin() { Window* pTB = pControl->GetChild( 0 ); if ( pControl->GetChildCount() == 1 && pTB->GetType() == WINDOW_TOOLBOX ) - return pTB; +// return pTB; + ; // do not act on floating toolboxes #i38796 else return pControl; } @@ -4049,6 +4050,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) } + // maybe this can get removed since we are using GetPreferredKeyInputWindow() if ( pControl->GetType() == WINDOW_COMBOBOX ) { // Bei COMBOBOX an das Edit direkt liefern Window *pTemp = NULL; @@ -4071,6 +4073,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) else // sonst fallback auf das Basisfenster pDeliverHere = pControl; } + pDeliverHere = pDeliverHere->GetPreferredKeyInputWindow(); KeyEvent aEvent; if ( ((USHORT)aString1.GetChar(i)) <= 7 ) { |