merge together hand-crafted traditional/simplified chinese tests

merge together a gadzillion hand-crafted
isSimpleChinese/isTraditionalChinese/isKoreanVariants/isCJK
implementations which should fix a goodly amount of them

add a MsLangId::isFamilyNameFirst for locales where
family name appears first while I'm at it.

Change-Id: I65377793be037d16fe7250cd7450b28aec689e83

1 files changed, 1 insertions, 17 deletions

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index dfb3d3d89a3c..59ee078a1e93 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -428,23 +428,7 @@ LanguageType MapCharToLanguage( sal_UCS4 uChar )
         if( !nDefaultLang )
             nDefaultLang = Application::GetSettings().GetUILanguage();
 
-        LanguageType nDefaultCJK = LANGUAGE_CHINESE;
-        switch( nDefaultLang )
-        {
-            case LANGUAGE_JAPANESE:
-            case LANGUAGE_KOREAN:
-            case LANGUAGE_KOREAN_JOHAB:
-            case LANGUAGE_CHINESE_SIMPLIFIED:
-            case LANGUAGE_CHINESE_TRADITIONAL:
-            case LANGUAGE_CHINESE_SINGAPORE:
-            case LANGUAGE_CHINESE_HONGKONG:
-            case LANGUAGE_CHINESE_MACAU:
-                nDefaultCJK = nDefaultLang;
-                break;
-            default:
-                nDefaultCJK = LANGUAGE_CHINESE;
-                break;
-        }
+        LanguageType nDefaultCJK = MsLangId::isCJK(nDefaultLang) ? nDefaultLang : LANGUAGE_CHINESE;
 
         // change the marked entries to prefered language
         static const int nCount = SAL_N_ELEMENTS(aLangFromCodeChart);