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

[Thomas Arnhold]

 i18nutil/source/utility/unicode.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 0c6a5d99ff82e4420f9f1c68152f89b7b5511517
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Oct 21 06:10:34 2013 +0200

    i18nutil: Add new enumeration values from ICU 52
    
    WaE: enumeration values 'USCRIPT_CAUCASIAN_ALBANIAN' and
    'USCRIPT_MAHAJANI' not handled in switch [-Wswitch]
    
    With ICU 4.9 there is no major/minor anymore, it's only ICU 49 or ICU 52.
    So adapt the previous check, too.
    
    Change-Id: Id938937b305165d407ced473ea1725e97efe9124
    See: http://icu-project.org/apiref/icu4c-latest/uscript_8h.html
    Reviewed-on: https://gerrit.libreoffice.org/6365
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index cda8c1a..872efc4 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -911,7 +911,7 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript)
             sRet = "woe";
             break;
 #endif
-#if (U_ICU_VERSION_MAJOR_NUM > 4)
+#if (U_ICU_VERSION_MAJOR_NUM >= 49)
         case USCRIPT_ANATOLIAN_HIEROGLYPHS:
             sRet = "hlu";
             break;
@@ -922,6 +922,14 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript)
             sRet = "mai";
             break;
 #endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 52)
+        case USCRIPT_CAUCASIAN_ALBANIAN:
+            sRet = "xag";
+            break;
+        case USCRIPT_MAHAJANI:
+            sRet = "mwr";
+            break;
+#endif
     }
     return sRet;
 }