diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-19 13:48:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-19 14:11:50 +0100 |
| commit | d9e4c74811855de15f1bf2045c2c9b061a2d4dc6 (patch) | |
| tree | 895cbcd595094e9fd2621a943fc83bb004b429c9 /svtools/source | |
| parent | 2a598619d7fbc992f1903a745fd536ddf5e45c81 (diff) | |
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
Diffstat (limited to 'svtools/source')
| -rw-r--r-- | svtools/source/control/ctrltool.cxx | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index e14b698c654d..3c8ff6c00862 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -895,22 +895,17 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage ) if ( eLanguage == LANGUAGE_SYSTEM ) eLanguage = MsLangId::getSystemUILanguage(); - switch( eLanguage ) + if (MsLangId::isSimplifiedChinese(eLanguage)) { - case LANGUAGE_CHINESE: - case LANGUAGE_CHINESE_SIMPLIFIED: - case LANGUAGE_CHINESE_SINGAPORE: - mpArray = aImplSimplifiedChinese; - mnElem = SAL_N_ELEMENTS(aImplSimplifiedChinese); - break; - // equivalent for traditional chinese disabled by popular request, #i89077# - - default: - mpArray = NULL; - mnElem = 0; - break; - }; + mpArray = aImplSimplifiedChinese; + mnElem = SAL_N_ELEMENTS(aImplSimplifiedChinese); + } + else + { + mpArray = NULL; + mnElem = 0; + } } //------------------------------------------------------------------------ |