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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index e18562d3113f..a521d59ef1c1 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -268,20 +268,12 @@ static Point lcl_ImplCalcRotatedPos( Point rPos, Point rOrigin, double nSin, dou #define isAinChar(c) IS_JOINING_GROUP((c), AIN) #define isAlefChar(c) IS_JOINING_GROUP((c), ALEF) #define isDalChar(c) IS_JOINING_GROUP((c), DAL) -#if U_ICU_VERSION_MAJOR_NUM >= 58 #define isFehChar(c) (IS_JOINING_GROUP((c), FEH) || IS_JOINING_GROUP((c), AFRICAN_FEH)) -#else -#define isFehChar(c) IS_JOINING_GROUP((c), FEH) -#endif #define isGafChar(c) IS_JOINING_GROUP((c), GAF) #define isHehChar(c) IS_JOINING_GROUP((c), HEH) #define isKafChar(c) IS_JOINING_GROUP((c), KAF) #define isLamChar(c) IS_JOINING_GROUP((c), LAM) -#if U_ICU_VERSION_MAJOR_NUM >= 58 #define isQafChar(c) (IS_JOINING_GROUP((c), QAF) || IS_JOINING_GROUP((c), AFRICAN_QAF)) -#else -#define isQafChar(c) IS_JOINING_GROUP((c), QAF) -#endif #define isRehChar(c) IS_JOINING_GROUP((c), REH) #define isTahChar(c) IS_JOINING_GROUP((c), TAH) #define isTehMarbutaChar(c) IS_JOINING_GROUP((c), TEH_MARBUTA) @@ -296,9 +288,7 @@ static bool isBehChar(sal_Unicode cCh) { case U_JG_BEH: case U_JG_NOON: -#if U_ICU_VERSION_MAJOR_NUM >= 58 case U_JG_AFRICAN_NOON: -#endif case U_JG_NYA: case U_JG_YEH: case U_JG_FARSI_YEH: |