[Libreoffice-commits] core.git: sw/source

[David Tardon]

 sw/source/core/text/porlay.cxx |   18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

New commits:
commit 65aafb507126760a293e16efe17fe7ac5ab186b5
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Nov 7 10:22:53 2016 +0100

    only cond. build stuff that is really new in ICU 58
    
    Change-Id: I59598329a7051374177b4d16aa061367b6043982

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 8a39d7d..ecd1fd7 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;