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 /i18npool/source | |
| 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 'i18npool/source')
| -rw-r--r-- | i18npool/source/breakiterator/breakiterator_unicode.cxx | 24 | ||||
| -rw-r--r-- | i18npool/source/collator/collator_unicode.cxx | 10 |
2 files changed, 0 insertions, 34 deletions
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 267da80894f0..7e19e863bc70 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -67,13 +67,6 @@ namespace { class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator { public: -#if (U_ICU_VERSION_MAJOR_NUM < 58) - // icu::RuleBasedBreakIterator::setBreakType() is private as of ICU 58. - void publicSetBreakType(int32_t type) - { - setBreakType(type); - }; -#endif OOoRuleBasedBreakIterator(UDataMemory* image, UErrorCode &status) : icu::RuleBasedBreakIterator(image, status) @@ -244,23 +237,6 @@ void BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocal } } } - if (rbi) { - #if (U_ICU_VERSION_MAJOR_NUM < 58) - // ICU 58 made RuleBasedBreakIterator::setBreakType() private - // instead of protected, so the old workaround of - // https://ssl.icu-project.org/trac/ticket/5498 - // doesn't work anymore. However, they also claim to have fixed - // the cause that an initial fBreakType==-1 would lead to an - // endless loop under some circumstances. - // Let's see ... - switch (rBreakType) { - case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break; - case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break; - case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break; - case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break; - } - #endif - } } while (false); if (!icuBI->mpValue || !icuBI->mpValue->mpBreakIterator) diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 8e54892efab4..7adf0f854488 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -252,16 +252,6 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: funclen = get_collator_data_ja_phonetic_alphanumeric_last_length; } #endif -#if WITH_LOCALE_ALL || WITH_LOCALE_ko -#if (U_ICU_VERSION_MAJOR_NUM < 53) - } else if ( rLocale.Language == "ko" ) { - if ( rAlgorithm == "charset" ) - { - func = get_collator_data_ko_charset; - funclen = get_collator_data_ko_charset_length; - } -#endif -#endif #if WITH_LOCALE_ALL || WITH_LOCALE_ku } else if ( rLocale.Language == "ku" ) { if ( rAlgorithm == "alphanumeric" ) |