summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2016-11-07 10:22:53 +0100
committerDavid Tardon <dtardon@redhat.com>2016-11-07 12:38:21 +0100
commit65aafb507126760a293e16efe17fe7ac5ab186b5 (patch)
tree8a251f04c8f738411b5cc7a018b340a3f35235c4 /sw
parentfebde9d61d1ee848f7b10edfd5954a25b6687946 (diff)
only cond. build stuff that is really new in ICU 58
Change-Id: I59598329a7051374177b4d16aa061367b6043982
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/text/porlay.cxx18
1 files changed, 2 insertions, 16 deletions
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 8a39d7d42e66..ecd1fd73df9f 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -83,8 +83,6 @@ using namespace i18n::ScriptType;
#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)
{
@@ -93,7 +91,9 @@ 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:
@@ -129,20 +129,6 @@ 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;