diff options
author | sb <sb@openoffice.org> | 2010-01-08 13:21:39 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-01-08 13:21:39 +0100 |
commit | e13e02de323f6660a2fd6bb5c54cd036a46205c5 (patch) | |
tree | 429d29f73ea482c98e9917b60eba4c73bde2127a /shell/source | |
parent | a44418ec3038019bfdffa8e1df3a0a080f74b0a9 (diff) | |
parent | b0c799c7fbaa93f707bf18a87eb9aef5d86be52c (diff) |
sb111: merged in DEV300_m69
Diffstat (limited to 'shell/source')
-rw-r--r-- | shell/source/backends/localebe/localebackend.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 75544c6d7f05..c22b626ad79c 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -37,7 +37,7 @@ #include <stdio.h> -#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2) +#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2) #include <rtl/ustrbuf.hxx> #include <locale.h> @@ -248,7 +248,7 @@ LocaleBackend* LocaleBackend::createInstance() rtl::OUString LocaleBackend::getLocale(void) { -#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2) +#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2) return ImplGetLocale(LC_CTYPE); #elif defined (MACOSX) return ImplGetLocale("AppleLocale"); @@ -261,7 +261,7 @@ rtl::OUString LocaleBackend::getLocale(void) rtl::OUString LocaleBackend::getUILocale(void) { -#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2) +#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2) return ImplGetLocale(LC_MESSAGES); #elif defined(MACOSX) return ImplGetLocale("AppleLanguages"); |