CWS-TOOLING: integrate CWS defaultdoclang

2009-08-21 14:44:21 +0200 cmc  r275260 : CWS-TOOLING: rebase CWS defaultdoclang to trunk@275001 (milestone: DEV300:m55)
2009-08-10 17:43:32 +0200 cmc  r274833 : CWS-TOOLING: rebase CWS defaultdoclang to trunk@274622 (milestone: DEV300:m54)
2009-07-24 11:46:58 +0200 cmc  r274297 : CWS-TOOLING: rebase CWS defaultdoclang to trunk@274203 (milestone: DEV300:m53)
2009-07-10 12:22:16 +0200 cmc  r273884 : #i99577# tweak the widths a bit
2009-07-08 15:17:58 +0200 cmc  r273834 : #i99577 tidy up indentation
2009-07-04 16:09:18 +0200 cmc  r273721 : #i99577# a "default" document language that reflects what the locale language is

2 files changed, 65 insertions, 0 deletions

diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18npool/inc/i18npool/mslangid.hxx
index 7cc5e6bd8926..27688cd995dc 100644
--- a/i18npool/inc/i18npool/mslangid.hxx
+++ b/i18npool/inc/i18npool/mslangid.hxx
@@ -216,6 +216,9 @@ public:
     static LanguageType getRealLanguageWithoutConfig( LanguageType nLang );
 
 
+    static LanguageType resolveSystemLanguageByScriptType( LanguageType nLang, sal_Int16 nType );
+
+
     /** Whether locale has a Right-To-Left orientation. */
     static bool isRightToLeft( LanguageType nLang );
 
@@ -246,6 +249,9 @@ public:
         configuration! */
     static void setConfiguredSystemLanguage( LanguageType nLang );
     static void setConfiguredSystemUILanguage( LanguageType nLang );
+    static void setConfiguredWesternFallback( LanguageType nLang );
+    static void setConfiguredComplexFallback( LanguageType nLang );
+    static void setConfiguredAsianFallback( LanguageType nLang );
 
 // ---------------------------------------------------------------------------
 
@@ -274,6 +280,10 @@ private:
     static LanguageType         nConfiguredSystemLanguage;
     static LanguageType         nConfiguredSystemUILanguage;
 
+    static LanguageType         nConfiguredWesternFallback;
+    static LanguageType         nConfiguredAsianFallback;
+    static LanguageType         nConfiguredComplexFallback;
+
     static LanguageType getPlatformSystemLanguage();
     static LanguageType getPlatformSystemUILanguage();
 
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index 668bc1641f06..d6a8f547c677 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -41,6 +41,9 @@
 LanguageType MsLangId::nConfiguredSystemLanguage   = LANGUAGE_SYSTEM;
 LanguageType MsLangId::nConfiguredSystemUILanguage = LANGUAGE_SYSTEM;
 
+LanguageType MsLangId::nConfiguredWesternFallback  = LANGUAGE_SYSTEM;
+LanguageType MsLangId::nConfiguredAsianFallback    = LANGUAGE_SYSTEM;
+LanguageType MsLangId::nConfiguredComplexFallback  = LANGUAGE_SYSTEM;
 
 // static
 void MsLangId::setConfiguredSystemLanguage( LanguageType nLang )
@@ -55,6 +58,23 @@ void MsLangId::setConfiguredSystemUILanguage( LanguageType nLang )
     nConfiguredSystemUILanguage = nLang;
 }
 
+// static
+void MsLangId::setConfiguredWesternFallback( LanguageType nLang )
+{
+    nConfiguredWesternFallback = nLang;
+}
+
+// static
+void MsLangId::setConfiguredAsianFallback( LanguageType nLang )
+{
+    nConfiguredAsianFallback = nLang;
+}
+
+// static
+void MsLangId::setConfiguredComplexFallback( LanguageType nLang )
+{
+    nConfiguredComplexFallback = nLang;
+}
 
 // static
 inline LanguageType MsLangId::simplifySystemLanguages( LanguageType nLang )
@@ -120,6 +140,41 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang )
 
 
 // static
+LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sal_Int16 nType )
+{
+    if (nLang == LANGUAGE_NONE)
+        return nLang;
+
+    nLang = getRealLanguage(nLang);
+    if (nType != ::com::sun::star::i18n::ScriptType::WEAK && getScriptType(nLang) != nType)
+    {
+        switch(nType)
+        {
+            case ::com::sun::star::i18n::ScriptType::ASIAN:
+                if (nConfiguredAsianFallback == LANGUAGE_SYSTEM)
+                    nLang = LANGUAGE_CHINESE_SIMPLIFIED;
+                else
+                    nLang = nConfiguredComplexFallback;
+                break;
+            case ::com::sun::star::i18n::ScriptType::COMPLEX:
+                if (nConfiguredComplexFallback == LANGUAGE_SYSTEM)
+                    nLang = LANGUAGE_HINDI;
+                else
+                    nLang = nConfiguredComplexFallback;
+                break;
+            default:
+                if (nConfiguredWesternFallback == LANGUAGE_SYSTEM)
+                    nLang = LANGUAGE_ENGLISH_US;
+                else
+                    nLang = nConfiguredWesternFallback;
+                break;
+                break;
+        }
+    }
+    return nLang;
+}
+
+// static
 void MsLangId::convertLanguageToLocale( LanguageType nLang,
         ::com::sun::star::lang::Locale & rLocale )
 {