|
Lines 72-77
Link Here
|
| 72 |
#include <isolang.hxx> |
72 |
#include <isolang.hxx> |
| 73 |
#endif |
73 |
#endif |
| 74 |
|
74 |
|
|
|
75 |
#ifdef MACOSX |
| 76 |
#ifndef _OSL_PROCESS_H_ |
| 77 |
#include <osl/process.h> |
| 78 |
#endif |
| 79 |
#ifndef _RTL_LOCALE_H_ |
| 80 |
#include <rtl/locale.h> |
| 81 |
#endif |
| 82 |
#endif |
| 83 |
|
| 75 |
// ======================================================================= |
84 |
// ======================================================================= |
| 76 |
|
85 |
|
| 77 |
static LanguageType eImplSystemLanguage = LANGUAGE_DONTKNOW; |
86 |
static LanguageType eImplSystemLanguage = LANGUAGE_DONTKNOW; |
|
Lines 139-146
Link Here
|
| 139 |
{ |
148 |
{ |
| 140 |
if ( eImplSystemLanguage == LANGUAGE_DONTKNOW ) |
149 |
if ( eImplSystemLanguage == LANGUAGE_DONTKNOW ) |
| 141 |
{ |
150 |
{ |
|
|
151 |
#ifdef MACOSX |
| 152 |
rtl_Locale *procLocale; |
| 153 |
|
| 154 |
if ( osl_getProcessLocale(&procLocale) == osl_Process_E_None ) |
| 155 |
{ |
| 156 |
UniString rLang( procLocale->Language->buffer ); |
| 157 |
UniString rCountry( procLocale->Country->buffer ); |
| 158 |
|
| 159 |
eImplSystemLanguage = ConvertIsoNamesToLanguage( rLang, rCountry ); |
| 160 |
#ifdef DEBUG |
| 161 |
if ( eImplSystemLanguage == LANGUAGE_DONTKNOW ) |
| 162 |
fprintf( stderr, "intnunx.cxx: failed to convert osl_getProcessLocale() language to system language.\n" ); |
| 163 |
#endif |
| 164 |
} |
| 165 |
#else /* MACOSX */ |
| 142 |
ByteString aUnxLang (GetLangFromEnvironment()); |
166 |
ByteString aUnxLang (GetLangFromEnvironment()); |
| 143 |
eImplSystemLanguage = ConvertUnxByteStringToLanguage( aUnxLang ); |
167 |
eImplSystemLanguage = ConvertUnxByteStringToLanguage( aUnxLang ); |
|
|
168 |
#endif /* MACOSX */ |
| 144 |
} |
169 |
} |
| 145 |
return eImplSystemLanguage; |
170 |
return eImplSystemLanguage; |
| 146 |
} |
171 |
} |
|
Lines 157-164
Link Here
|
| 157 |
{ |
182 |
{ |
| 158 |
if ( eImplSystemLanguage == LANGUAGE_DONTKNOW ) |
183 |
if ( eImplSystemLanguage == LANGUAGE_DONTKNOW ) |
| 159 |
{ |
184 |
{ |
| 160 |
ByteString aUnxLang (GetUILangFromEnvironment()); |
185 |
#ifdef MACOSX |
|
|
186 |
rtl_Locale *procLocale; |
| 187 |
|
| 188 |
if ( osl_getProcessLocale(&procLocale) == osl_Process_E_None ) |
| 189 |
{ |
| 190 |
UniString rLang( procLocale->Language->buffer ); |
| 191 |
UniString rCountry( procLocale->Country->buffer ); |
| 192 |
|
| 193 |
eImplSystemLanguage = ConvertIsoNamesToLanguage( rLang, rCountry ); |
| 194 |
#ifdef DEBUG |
| 195 |
if ( eImplSystemLanguage == LANGUAGE_DONTKNOW ) |
| 196 |
fprintf( stderr, "intnunx.cxx: failed to convert osl_getProcessLocale() language to system language.\n" ); |
| 197 |
#endif |
| 198 |
} |
| 199 |
#else /* MACOSX */ |
| 200 |
ByteString aUnxLang (GetLangFromEnvironment()); |
| 161 |
eImplSystemLanguage = ConvertUnxByteStringToLanguage( aUnxLang ); |
201 |
eImplSystemLanguage = ConvertUnxByteStringToLanguage( aUnxLang ); |
|
|
202 |
#endif /* MACOSX */ |
| 162 |
} |
203 |
} |
| 163 |
return eImplSystemLanguage; |
204 |
return eImplSystemLanguage; |
| 164 |
} |
205 |
} |