diff options
author | Eike Rathke <erack@redhat.com> | 2021-10-18 22:02:52 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2021-10-18 23:23:56 +0200 |
commit | 20081a8ea052b2f31915bd127c3b282cf5025d59 (patch) | |
tree | dcc5aa35b9fe0b128dac3b44068459a5222d0655 /i18nlangtag | |
parent | c7f0fddb4a1a0dcc0dd21d2a27d67d4e75a8195c (diff) |
Introduce MsLangId::getConfiguredSystemLanguage()
To be used instead of getSystemLanguage() in a subsequent change.
For details see commit summary of
commit aec5312ffab24236876693d7a8b55843847f2a48
CommitDate: Mon Oct 18 21:14:24 2021 +0200
Related: tdf#145173 Ensure known supported system and default document locale
Change-Id: I5bed125e47c2a03fe2e7a4f84988b2e8841143c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123766
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'i18nlangtag')
-rw-r--r-- | i18nlangtag/source/isolang/mslangid.cxx | 46 |
1 files changed, 34 insertions, 12 deletions
diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx index d3bcee020a00..4cc448768f3a 100644 --- a/i18nlangtag/source/isolang/mslangid.cxx +++ b/i18nlangtag/source/isolang/mslangid.cxx @@ -81,19 +81,9 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang ) { LanguageType simplifyLang = simplifySystemLanguages( nLang); if (simplifyLang == LANGUAGE_SYSTEM ) - { - if (nConfiguredSystemLanguage == LANGUAGE_SYSTEM) - nLang = getSystemLanguage(); - else - nLang = nConfiguredSystemLanguage; - } + nLang = getConfiguredSystemLanguage(); else if (simplifyLang == LANGUAGE_HID_HUMAN_INTERFACE_DEVICE) - { - if (nConfiguredSystemUILanguage == LANGUAGE_SYSTEM) - nLang = getSystemUILanguage(); - else - nLang = nConfiguredSystemUILanguage; - } + nLang = getConfiguredSystemUILanguage(); else { /* TODO: would this be useful here? */ @@ -107,6 +97,38 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang ) // static +LanguageType MsLangId::getConfiguredSystemLanguage() +{ + if (nConfiguredSystemLanguage != LANGUAGE_SYSTEM) + return nConfiguredSystemLanguage; + return getSystemLanguage(); +} + + +// static +LanguageType MsLangId::getConfiguredSystemUILanguage() +{ + if (nConfiguredSystemUILanguage != LANGUAGE_SYSTEM) + return nConfiguredSystemUILanguage; + return getSystemUILanguage(); +} + + +// static +LanguageType MsLangId::getSystemLanguage() +{ + return getPlatformSystemLanguage(); +} + + +// static +LanguageType MsLangId::getSystemUILanguage() +{ + return getPlatformSystemUILanguage(); +} + + +// static LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sal_Int16 nType ) { if (nLang == LANGUAGE_NONE) |