mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build with ICU < 58

Browse Source 
Change-Id: I84027f0812e672519ed314639deeb5c0d1069624
This commit is contained in:
David Tardon
2016-11-07 09:28:11 +01:00
parent 02cf121aab
commit 01ff03e154
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sw/source/core/text/porlay.cxx
View File

@@ -63,18 +63,28 @@ using namespace i18n::ScriptType;
#define isAinChar(c) IS_JOINING_GROUP((c), AIN) #define isAinChar(c) IS_JOINING_GROUP((c), AIN)
#define isAlefChar(c) IS_JOINING_GROUP((c), ALEF) #define isAlefChar(c) IS_JOINING_GROUP((c), ALEF)
#define isDalChar(c) IS_JOINING_GROUP((c), DAL) #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)) #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 isGafChar(c) IS_JOINING_GROUP((c), GAF)
#define isHehChar(c) IS_JOINING_GROUP((c), HEH) #define isHehChar(c) IS_JOINING_GROUP((c), HEH)
#define isKafChar(c) IS_JOINING_GROUP((c), KAF) #define isKafChar(c) IS_JOINING_GROUP((c), KAF)
#define isLamChar(c) IS_JOINING_GROUP((c), LAM) #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)) #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 isRehChar(c) IS_JOINING_GROUP((c), REH)
#define isTahChar(c) IS_JOINING_GROUP((c), TAH) #define isTahChar(c) IS_JOINING_GROUP((c), TAH)
#define isTehMarbutaChar(c) IS_JOINING_GROUP((c), TEH_MARBUTA) #define isTehMarbutaChar(c) IS_JOINING_GROUP((c), TEH_MARBUTA)
#define isWawChar(c) IS_JOINING_GROUP((c), WAW) #define isWawChar(c) IS_JOINING_GROUP((c), WAW)
#define isSeenOrSadChar(c) (IS_JOINING_GROUP((c), SAD) || IS_JOINING_GROUP((c), SEEN)) #define isSeenOrSadChar(c) (IS_JOINING_GROUP((c), SAD) || IS_JOINING_GROUP((c), SEEN))
#if U_ICU_VERSION_MAJOR_NUM >= 58
// Beh and charters that behave like Beh in medial form. // Beh and charters that behave like Beh in medial form.
bool isBehChar(sal_Unicode cCh) bool isBehChar(sal_Unicode cCh)
{ {
@@ -119,6 +129,20 @@ bool isYehChar(sal_Unicode cCh)
return bRet; return bRet;
} }
#else
bool isBehChar(sal_Unicode)
{
return false;
}
bool isYehChar(sal_Unicode)
{
return false;
}
#endif
bool isTransparentChar ( sal_Unicode cCh ) bool isTransparentChar ( sal_Unicode cCh )
{ {
return u_getIntPropertyValue( cCh, UCHAR_JOINING_TYPE ) == U_JT_TRANSPARENT; return u_getIntPropertyValue( cCh, UCHAR_JOINING_TYPE ) == U_JT_TRANSPARENT;