mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use LANGUAGE_MASK_PRIMARY in MsLangId::getScriptType()

Browse Source 
Change-Id: I55ce19b615722fe9152a4c683037bbb4578dd49e
This commit is contained in:
Eike Rathke
2013-10-17 21:53:53 +02:00
parent 2b8b417401
commit 45d569be8f
1 changed files with 67 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
i18nlangtag/source/isolang/mslangid.cxx
View File

@@ -312,65 +312,19 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
sal_Int16 nScript; sal_Int16 nScript;
switch( nLang ) switch( nLang )
{ {
// CJK // CTL
// all LANGUAGE_CHINESE_... are caught below case LANGUAGE_MONGOLIAN_MONGOLIAN:
case LANGUAGE_JAPANESE: case LANGUAGE_USER_KURDISH_IRAN:
case LANGUAGE_KOREAN: case LANGUAGE_USER_KURDISH_IRAQ:
case LANGUAGE_KOREAN_JOHAB: case LANGUAGE_USER_KYRGYZ_CHINA:
case LANGUAGE_USER_KOREAN_NORTH: nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
nScript = ::com::sun::star::i18n::ScriptType::ASIAN;
break; break;
// CTL // "Western"
// all LANGUAGE_ARABIC_... are caught below case LANGUAGE_MONGOLIAN:
case LANGUAGE_AMHARIC_ETHIOPIA: case LANGUAGE_USER_KURDISH_SYRIA:
case LANGUAGE_ASSAMESE: case LANGUAGE_USER_KURDISH_TURKEY:
case LANGUAGE_BENGALI: nScript = ::com::sun::star::i18n::ScriptType::LATIN;
case LANGUAGE_BENGALI_BANGLADESH:
case LANGUAGE_BURMESE:
case LANGUAGE_FARSI:
case LANGUAGE_HEBREW:
case LANGUAGE_YIDDISH:
case LANGUAGE_USER_YIDDISH_US:
case LANGUAGE_MARATHI:
case LANGUAGE_PUNJABI:
case LANGUAGE_GUJARATI:
case LANGUAGE_HINDI:
case LANGUAGE_KANNADA:
case LANGUAGE_KASHMIRI:
case LANGUAGE_KASHMIRI_INDIA:
case LANGUAGE_KHMER:
case LANGUAGE_LAO:
case LANGUAGE_MALAYALAM:
case LANGUAGE_MANIPURI:
case LANGUAGE_MONGOLIAN_MONGOLIAN:
case LANGUAGE_NEPALI:
case LANGUAGE_NEPALI_INDIA:
case LANGUAGE_ORIYA:
case LANGUAGE_SANSKRIT:
case LANGUAGE_SINDHI:
case LANGUAGE_SINDHI_PAKISTAN:
case LANGUAGE_SINHALESE_SRI_LANKA:
case LANGUAGE_SYRIAC:
case LANGUAGE_TAMIL:
case LANGUAGE_TELUGU:
case LANGUAGE_THAI:
case LANGUAGE_TIBETAN:
case LANGUAGE_DZONGKHA:
case LANGUAGE_USER_TIBETAN_INDIA:
case LANGUAGE_URDU_PAKISTAN:
case LANGUAGE_URDU_INDIA:
case LANGUAGE_USER_KURDISH_IRAQ:
case LANGUAGE_USER_KURDISH_IRAN:
case LANGUAGE_DHIVEHI:
case LANGUAGE_USER_BODO_INDIA:
case LANGUAGE_USER_DOGRI_INDIA:
case LANGUAGE_USER_MAITHILI_INDIA:
case LANGUAGE_UIGHUR_CHINA:
case LANGUAGE_USER_LIMBU:
case LANGUAGE_USER_KYRGYZ_CHINA:
case LANGUAGE_USER_NKO:
nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
break; break;
// currently not knowing scripttype - defaulted to LATIN: // currently not knowing scripttype - defaulted to LATIN:
@@ -383,22 +337,62 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
#define LANGUAGE_TATAR 0x0444 #define LANGUAGE_TATAR 0x0444
*/ */
default: default:
switch ( nLang & LANGUAGE_MASK_PRIMARY ) switch ( nLang & LANGUAGE_MASK_PRIMARY )
{ {
// CJK catcher // CJK catcher
case LANGUAGE_CHINESE & LANGUAGE_MASK_PRIMARY: case LANGUAGE_CHINESE & LANGUAGE_MASK_PRIMARY:
nScript = ::com::sun::star::i18n::ScriptType::ASIAN; case LANGUAGE_JAPANESE & LANGUAGE_MASK_PRIMARY:
break; case LANGUAGE_KOREAN & LANGUAGE_MASK_PRIMARY:
// CTL catcher nScript = ::com::sun::star::i18n::ScriptType::ASIAN;
case LANGUAGE_ARABIC_SAUDI_ARABIA & LANGUAGE_MASK_PRIMARY: break;
nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
break; // CTL catcher
// Western (actually not necessarily Latin but also Cyrillic, for example) case LANGUAGE_AMHARIC_ETHIOPIA & LANGUAGE_MASK_PRIMARY:
default: case LANGUAGE_ARABIC_SAUDI_ARABIA & LANGUAGE_MASK_PRIMARY:
nScript = ::com::sun::star::i18n::ScriptType::LATIN; case LANGUAGE_ASSAMESE & LANGUAGE_MASK_PRIMARY:
} case LANGUAGE_BENGALI & LANGUAGE_MASK_PRIMARY:
break; case LANGUAGE_BURMESE & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_DHIVEHI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_FARSI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_GUJARATI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_HEBREW & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_HINDI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_KANNADA & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_KASHMIRI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_KHMER & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_LAO & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_MALAYALAM & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_MANIPURI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_MARATHI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_NEPALI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_ORIYA & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_PUNJABI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_SANSKRIT & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_SINDHI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_SINHALESE_SRI_LANKA & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_SYRIAC & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_TAMIL & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_TELUGU & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_THAI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_TIBETAN & LANGUAGE_MASK_PRIMARY: // also LANGUAGE_DZONGKHA
case LANGUAGE_UIGHUR_CHINA & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_URDU_INDIA & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_USER_BODO_INDIA & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_USER_DOGRI_INDIA & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_USER_LIMBU & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_USER_MAITHILI_INDIA & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_USER_NKO & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_YIDDISH & LANGUAGE_MASK_PRIMARY:
nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
break;
// Western (actually not necessarily Latin but also Cyrillic,
// for example)
default:
nScript = ::com::sun::star::i18n::ScriptType::LATIN;
}
break;
} }
return nScript; return nScript;
} }