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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index bf8c89d0d125..fc7fe021702c 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -9727,12 +9727,7 @@ void ScInterpreter::ScRegex() { // Find n-th occurrence. sal_Int32 nCount = 0; -#if (U_ICU_VERSION_MAJOR_NUM < 55) - int32_t nStartPos = 0; - while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status) && ++nCount < nOccurrence) -#else while (aRegexMatcher.find(status) && U_SUCCESS(status) && ++nCount < nOccurrence) -#endif ; if (U_FAILURE(status)) { @@ -9772,12 +9767,7 @@ void ScInterpreter::ScRegex() { // Replace n-th occurrence of match with replacement. sal_Int32 nCount = 0; -#if (U_ICU_VERSION_MAJOR_NUM < 55) - int32_t nStartPos = 0; - while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status)) -#else while (aRegexMatcher.find(status) && U_SUCCESS(status)) -#endif { // XXX NOTE: After several RegexMatcher::find() the // RegexMatcher::appendReplacement() still starts at the |