diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:48:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:48:32 +0000 |
| commit | ba18c8c52b42a4b6bf1731d424582a7ac5a36d99 (patch) | |
| tree | a7fc0a56df5b5a13d0b891f6af0c4dbeb8be02f5 /vcl | |
| parent | 980dea4b9e3271813fbb39b2932335241e2a50bf (diff) | |
INTEGRATION: CWS svp01 (1.35.182); FILE MERGED
2006/06/27 12:54:16 pl 1.35.182.2: RESYNC: (1.35-1.36); FILE MERGED
2006/05/22 16:35:31 pl 1.35.182.1: #135265# free plugin abstraction of dependency on X11 specific SalData
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/i18n_ic.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx index 7f57f5f4a05b..ed291983e011 100644 --- a/vcl/unx/source/app/i18n_ic.cxx +++ b/vcl/unx/source/app/i18n_ic.cxx @@ -4,9 +4,9 @@ * * $RCSfile: i18n_ic.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: hr $ $Date: 2006-06-19 19:48:53 $ + * last change: $Author: hr $ $Date: 2006-08-11 17:48:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -214,7 +214,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aInputEv.mbOnlyCursor = FALSE; SalI18N_InputMethod *pInputMethod; - pInputMethod = GetSalData()->GetDisplay()->GetInputMethod(); + pInputMethod = GetX11SalData()->GetDisplay()->GetInputMethod(); mbMultiLingual = pInputMethod->IsMultiLingual(); mnSupportedPreeditStyle = XIMPreeditCallbacks | XIMPreeditPosition @@ -329,7 +329,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : // XCreateIC() fails on Redflag Linux 2.0 if there is no // fontset though the data itself is not evaluated nor is // it required according to the X specs. - Display* pDisplay = GetSalData()->GetDisplay()->GetDisplay(); + Display* pDisplay = GetX11SalData()->GetDisplay()->GetDisplay(); XFontSet pFontSet = get_font_set(pDisplay); if (pFontSet != NULL) @@ -477,7 +477,7 @@ SalI18N_InputContext::Map( SalFrame *pFrame ) if ( maContext == NULL ) { SalI18N_InputMethod *pInputMethod; - pInputMethod = GetSalData()->GetDisplay()->GetInputMethod(); + pInputMethod = GetX11SalData()->GetDisplay()->GetInputMethod(); maContext = XCreateIC( pInputMethod->GetMethod(), XNVaNestedList, mpAttributes, @@ -723,7 +723,7 @@ SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame ) { sendEmptyCommit(pFocusFrame); // begin preedit again - GetSalData()->GetDisplay()->SendInternalEvent( pFocusFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT ); + GetX11SalData()->GetDisplay()->SendInternalEvent( pFocusFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT ); } XSetICFocus( maContext ); @@ -740,7 +740,7 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame ) if ( mbUseable && (maContext != NULL) ) { // cancel an eventual event posted to begin preedit again - GetSalData()->GetDisplay()->CancelInternalEvent( maClientData.pFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT ); + GetX11SalData()->GetDisplay()->CancelInternalEvent( maClientData.pFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT ); maClientData.pFrame = NULL; XUnsetICFocus( maContext ); } @@ -801,7 +801,7 @@ SalI18N_InputContext::EndExtTextInput( USHORT /*nFlags*/ ) if( static_cast<X11SalFrame*>(maClientData.pFrame)->hasFocus() ) { // begin preedit again - GetSalData()->GetDisplay()->SendInternalEvent( maClientData.pFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT ); + GetX11SalData()->GetDisplay()->SendInternalEvent( maClientData.pFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT ); } } } |