[Libreoffice-commits] .: i18nutil/source

[Libreoffice Gerrit user]

 i18nutil/source/utility/unicode.cxx |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit ee1b6b657ce15a449f091543551d650004353806
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 3 20:45:01 2012 +0100

    these 9 scripts are in icu >= 4.8, but not in 4.6.1
    
    Change-Id: I418968e0a8959730e5ef0c20769fd07ca1f8f23c

diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 0100556..2f6f6dd 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -494,10 +494,10 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript)
         case USCRIPT_UNKNOWN:
             sRet = "und";
             break;
-        //This block has no language with an assigned code yet
-        case USCRIPT_NABATAEAN:
-        case USCRIPT_PALMYRENE:
-        case USCRIPT_NUSHU:
+        case USCRIPT_NABATAEAN: //no language with an assigned code yet
+            sRet = "mis";
+            break;
+        case USCRIPT_PALMYRENE: //no language with an assigned code yet
             sRet = "mis";
             break;
         case USCRIPT_ARABIC:
@@ -907,6 +907,7 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript)
         case USCRIPT_WARANG_CITI:
             sRet = "hoc";
             break;
+#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 8)
         case USCRIPT_AFAKA:
             sRet = "djk";
             break;
@@ -916,6 +917,9 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript)
         case USCRIPT_MRO:
             sRet = "cmr";
             break;
+        case USCRIPT_NUSHU: //no language with an assigned code yet
+            sRet = "mis";
+            break;
         case USCRIPT_SHARADA:
             sRet = "sa";
             break;
@@ -931,6 +935,7 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript)
         case USCRIPT_WOLEAI:
             sRet = "woe";
             break;
+#endif
 #if (U_ICU_VERSION_MAJOR_NUM > 4)
         case USCRIPT_ANATOLIAN_HIEROGLYPHS:
             sRet = "hlu";