diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-10-21 06:10:34 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 10:38:43 +0000 |
| commit | 0c6a5d99ff82e4420f9f1c68152f89b7b5511517 (patch) | |
| tree | 48cdf14615ede0c5af166219969485b1b296cfd6 /i18nutil | |
| parent | 28977ea778cc7c8c16c16f1c8b2b6bb6a53b48f7 (diff) | |
i18nutil: Add new enumeration values from ICU 52
WaE: enumeration values 'USCRIPT_CAUCASIAN_ALBANIAN' and
'USCRIPT_MAHAJANI' not handled in switch [-Wswitch]
With ICU 4.9 there is no major/minor anymore, it's only ICU 49 or ICU 52.
So adapt the previous check, too.
Change-Id: Id938937b305165d407ced473ea1725e97efe9124
See: http://icu-project.org/apiref/icu4c-latest/uscript_8h.html
Reviewed-on: https://gerrit.libreoffice.org/6365
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'i18nutil')
| -rw-r--r-- | i18nutil/source/utility/unicode.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index cda8c1a02800..872efc47a652 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -911,7 +911,7 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript) sRet = "woe"; break; #endif -#if (U_ICU_VERSION_MAJOR_NUM > 4) +#if (U_ICU_VERSION_MAJOR_NUM >= 49) case USCRIPT_ANATOLIAN_HIEROGLYPHS: sRet = "hlu"; break; @@ -922,6 +922,14 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript) sRet = "mai"; break; #endif +#if (U_ICU_VERSION_MAJOR_NUM >= 52) + case USCRIPT_CAUCASIAN_ALBANIAN: + sRet = "xag"; + break; + case USCRIPT_MAHAJANI: + sRet = "mwr"; + break; +#endif } return sRet; } |