diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:55:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:55:36 +0000 |
| commit | ba7c39dee4394d9a074378c6353590c04a4b28b6 (patch) | |
| tree | c8287205e3641a1158a7c1ef50cd3b3990481f13 /vcl/unx | |
| parent | 4cc526cebcdf25ad0b80fdbd4cb5ca158f227daa (diff) | |
INTEGRATION: CWS nwf (1.28.66); FILE MERGED
2004/03/01 13:34:01 pl 1.28.66.1: first step in SalDisplay cleanup
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/source/app/i18n_ic.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx index 7451f3559104..21bebe42129a 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.28 $ + * $Revision: 1.29 $ * - * last change: $Author: vg $ $Date: 2004-01-06 14:27:15 $ + * last change: $Author: hr $ $Date: 2004-05-10 15:55:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -222,7 +222,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aText.pCharStyle = NULL; SalI18N_InputMethod *pInputMethod; - pInputMethod = GetSalData()->GetDefDisp()->GetInputMethod(); + pInputMethod = GetSalData()->GetDisplay()->GetInputMethod(); mbMultiLingual = pInputMethod->IsMultiLingual(); mnSupportedPreeditStyle = XIMPreeditCallbacks | XIMPreeditPosition @@ -337,7 +337,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()->GetDefDisp()->GetDisplay(); + Display* pDisplay = GetSalData()->GetDisplay()->GetDisplay(); XFontSet pFontSet = get_font_set(pDisplay); if (pFontSet != NULL) @@ -489,7 +489,7 @@ SalI18N_InputContext::Map( SalFrame *pFrame ) if ( maContext == NULL ) { SalI18N_InputMethod *pInputMethod; - pInputMethod = GetSalData()->GetDefDisp()->GetInputMethod(); + pInputMethod = GetSalData()->GetDisplay()->GetInputMethod(); maContext = XCreateIC( pInputMethod->GetMethod(), XNVaNestedList, mpAttributes, |