commit 01ff03e15449a618a4a8623a29eb9ea5917e6c22
author David Tardon <dtardon@redhat.com> Mon Nov 07 09:28:11 2016 +0100
committer David Tardon <dtardon@redhat.com> Mon Nov 07 09:28:38 2016 +0100
tree 7a46534b5453cbc480a80d74421f3d80ad30cab1
parent 02cf121aaba00a4ef7f8fe44203838e0fa1cf738

fix build with ICU < 58

Change-Id: I84027f0812e672519ed314639deeb5c0d1069624

sw/source/core/text/porlay.cxx

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 64b6723..8a39d7d 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -63,18 +63,28 @@ using namespace i18n::ScriptType;
#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)
#define isWawChar(c)        IS_JOINING_GROUP((c), WAW)
#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.
bool isBehChar(sal_Unicode cCh)
{
@@ -119,6 +129,20 @@ bool isYehChar(sal_Unicode cCh)
    return bRet;
}

#else

bool isBehChar(sal_Unicode)
{
    return false;
}

bool isYehChar(sal_Unicode)
{
    return false;
}

#endif

bool isTransparentChar ( sal_Unicode cCh )
{
    return u_getIntPropertyValue( cCh, UCHAR_JOINING_TYPE ) == U_JT_TRANSPARENT;