diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-19 14:32:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-19 15:42:14 +0000 |
| commit | 138e5a051805ca8a3b7e9626742cc475e3577cc4 (patch) | |
| tree | b9e382a8c5e7faebca3f9342b2433567078530d4 /i18nutil | |
| parent | 95e6a0885e65cc57b11719cc0658be9d8b78fba9 (diff) | |
make it possible to build with system icu 4.2 (RHEL-6)
Change-Id: I69bf7bc33a619c4aa9483e2dc3d5540e4dfa7458
Diffstat (limited to 'i18nutil')
| -rw-r--r-- | i18nutil/source/utility/unicode.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index 2f6f6dd17952..ba62d71181ae 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -494,12 +494,6 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_UNKNOWN: sRet = "und"; break; - case USCRIPT_NABATAEAN: //no language with an assigned code yet - sRet = "mis"; - break; - case USCRIPT_PALMYRENE: //no language with an assigned code yet - sRet = "mis"; - break; case USCRIPT_ARABIC: sRet = "ar"; break; @@ -742,9 +736,6 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_LINEAR_A: sRet = "ecr"; break; - case USCRIPT_MANDAIC: - sRet = "mic"; - break; case USCRIPT_MAYAN_HIEROGLYPHS: sRet = "myn"; break; @@ -862,6 +853,16 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_TAI_VIET: sRet = "blt"; break; +#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 4) + case USCRIPT_NABATAEAN: //no language with an assigned code yet + sRet = "mis"; + break; + case USCRIPT_PALMYRENE: //no language with an assigned code yet + sRet = "mis"; + break; + case USCRIPT_MANDAIC: + sRet = "mic"; + break; case USCRIPT_BAMUM: sRet = "bax"; break; @@ -907,6 +908,7 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_WARANG_CITI: sRet = "hoc"; break; +#endif #if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 8) case USCRIPT_AFAKA: sRet = "djk"; |