diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-18 16:54:40 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-18 16:54:40 +0000 |
| commit | 8db292ce9d2d0988c378933050128f5f0cd667b6 (patch) | |
| tree | d6bf6c95a50871823aaee8fd144718087c91e8db | |
| parent | 9ed093f18e037cade1ce1fa4e743b8d9482eff98 (diff) | |
INTEGRATION: CWS vcl36 (1.30.210); FILE MERGED
2005/03/08 17:43:45 pl 1.30.210.1: #i41330# set focus to context again after XmbResetIC
| -rw-r--r-- | vcl/unx/source/app/i18n_ic.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx index e4cc95e94a24..e7c5b3b3979d 100644 --- a/vcl/unx/source/app/i18n_ic.cxx +++ b/vcl/unx/source/app/i18n_ic.cxx @@ -2,9 +2,9 @@ * * $RCSfile: i18n_ic.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: kz $ $Date: 2004-05-18 10:57:02 $ + * last change: $Author: kz $ $Date: 2005-03-18 17:54:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -806,6 +806,8 @@ SalI18N_InputContext::EndExtTextInput( USHORT nFlags ) { if ( mbUseable && (maContext != NULL) ) { + SalFrame* pOldFocusFrame = mpFocusFrame; + // restore conversion state after resetting XIC XIMPreeditState preedit_state = XIMPreeditUnKnown; XVaNestedList preedit_attr; @@ -890,6 +892,11 @@ SalI18N_InputContext::EndExtTextInput( USHORT nFlags ) } if ( pPendingChars != NULL ) XFree ( (void*)pPendingChars ); + + /* #i41330# workaround XmbResetIC disabling the whole context + */ + if( mpFocusFrame && mpFocusFrame == pOldFocusFrame ) + SetICFocus( mpFocusFrame ); } } |