diff options
| author | Khaled Hosny <khaled@libreoffice.org> | 2023-06-21 11:38:20 +0300 |
|---|---|---|
| committer | خالد حسني <khaled@libreoffice.org> | 2023-06-21 16:59:20 +0200 |
| commit | f0b87e8162511202aa3fe0c2af09c74107a7b3ea (patch) | |
| tree | 94d39fac8bef8b1356966738b1d89390e961f116 /i18nutil | |
| parent | c7b2277f57cf72b7dc6e4cbd179ce40951fbae8c (diff) | |
Require icu-i18n >= 66
We were requiring ICU 4.6 which was released in 2011, and ifdef'ing our
way through newer ICU versions. ICU is a core dependency and it makes no
sense to build LibreOffice with such ancient versions of it.
This change requires ICU 66 (released in 2020), and removes all the
ifdefs for older versions. There are more cleanups to do, but these will
be done separately.
Change-Id: I2e4f7608a08f4d531b0a4c74bbfdf91a451f833f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153387
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@libreoffice.org>
Diffstat (limited to 'i18nutil')
| -rw-r--r-- | i18nutil/source/utility/unicode.cxx | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index e2e4199074ff..19a6bdf0b416 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -190,12 +190,8 @@ sal_Int16 unicode::getScriptClassFromUScriptCode(UScriptCode eScript) case USCRIPT_TRADITIONAL_HAN: case USCRIPT_JAPANESE: case USCRIPT_KOREAN: -#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 8) case USCRIPT_TANGUT: -#endif -#if (U_ICU_VERSION_MAJOR_NUM >= 66) case USCRIPT_KHITAN_SMALL_SCRIPT: -#endif nRet = ScriptType::ASIAN; break; case USCRIPT_ARABIC: @@ -775,7 +771,6 @@ OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_WARANG_CITI: sRet = "hoc"; break; -#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 8) case USCRIPT_AFAKA: sRet = "djk"; break; @@ -803,8 +798,6 @@ OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_WOLEAI: sRet = "woe"; break; -#endif -#if (U_ICU_VERSION_MAJOR_NUM >= 49) case USCRIPT_ANATOLIAN_HIEROGLYPHS: sRet = "hlu"; break; @@ -814,16 +807,12 @@ OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_TIRHUTA: 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 -#if (U_ICU_VERSION_MAJOR_NUM >= 54) case USCRIPT_AHOM: sRet = "aho"; break; @@ -842,8 +831,6 @@ OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_SIDDHAM: sRet = "sa-Sidd"; break; -#endif -#if (U_ICU_VERSION_MAJOR_NUM >= 58) case USCRIPT_ADLAM: sRet = "mis-Adlm"; // Adlam for Fulani, no language code break; @@ -868,8 +855,6 @@ OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_SYMBOLS_EMOJI: sRet = "mis-Zsye"; // Emoji variant break; -#endif -#if (U_ICU_VERSION_MAJOR_NUM >= 60) case USCRIPT_MASARAM_GONDI: sRet = "gon-Gonm"; // macro language code, could be wsg,esg,gno break; @@ -879,8 +864,6 @@ OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_ZANABAZAR_SQUARE: sRet = "mn-Zanb"; // abugida to write Mongolian break; -#endif -#if (U_ICU_VERSION_MAJOR_NUM >= 62) case USCRIPT_DOGRA: sRet = "dgo"; // Dogri proper break; @@ -902,8 +885,6 @@ OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_OLD_SOGDIAN: sRet = "sog"; break; -#endif -#if (U_ICU_VERSION_MAJOR_NUM >= 64) case USCRIPT_ELYMAIC: sRet = "arc-Elym"; break; @@ -916,8 +897,6 @@ OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_WANCHO: sRet = "nnp-Wcho"; break; -#endif -#if (U_ICU_VERSION_MAJOR_NUM >= 66) case USCRIPT_CHORASMIAN: sRet = "xco-Chrs"; break; @@ -930,7 +909,6 @@ OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) case USCRIPT_YEZIDI: sRet = "kmr-Yezi"; break; -#endif #if (U_ICU_VERSION_MAJOR_NUM >= 70) case USCRIPT_CYPRO_MINOAN: sRet = "mis-Cpmn"; // Uncoded with script |