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

1 files changed, 20 insertions, 17 deletions

diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index 9376458bdf6f..4966fde852f3 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
@@ -57,14 +57,31 @@ public:
         return LanguageType((sal_uInt16(nLangID) & ~LANGUAGE_MASK_PRIMARY) >> 10);
     }
 
+    /** Get the configured system language/locale.
+        If not set yet then getSystemLanguage().
+
+        Prefer this over getSystemLanguage() unless you exactly know why you
+        would not. */
+    static LanguageType getConfiguredSystemLanguage();
+
+    /** Get the configured system UI language/locale.
+        If not set yet then getSystemUILanguage().
+
+        Prefer this over getSystemUILanguage() unless you exactly know why you
+        would not. */
+    static LanguageType getConfiguredSystemUILanguage();
+
+
     /** Language/locale of category LC_CTYPE (on Unix, else the system
         language).
-        Evaluation order: LC_ALL, LC_CTYPE, LANG */
+        Evaluation order: LC_ALL, LC_CTYPE, LANG
+        Note this may return an unknown unsupported locale. */
     static LanguageType getSystemLanguage();
 
     /** Language/locale of category LC_MESSAGES (on Unix, else same as
-        GetSystemLanguage()).
-        Evaluation order: LANGUAGE, LC_ALL, LC_MESSAGES, LANG */
+        getSystemLanguage()).
+        Evaluation order: LANGUAGE, LC_ALL, LC_MESSAGES, LANG
+        Note this may return an unknown unsupported locale. */
     static LanguageType getSystemUILanguage();
 
 
@@ -312,20 +329,6 @@ private:
     I18NLANGTAG_DLLPRIVATE static inline LanguageType simplifySystemLanguages( LanguageType nLang );
 };
 
-
-// static
-inline LanguageType MsLangId::getSystemLanguage()
-{
-    return getPlatformSystemLanguage();
-}
-
-
-// static
-inline LanguageType MsLangId::getSystemUILanguage()
-{
-    return getPlatformSystemUILanguage();
-}
-
 #endif // INCLUDED_I18NLANGTAG_MSLANGID_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */