[Libreoffice-commits] .: Branch 'libreoffice-4-0' - i18npool/inc i18npool/source

[Libreoffice Gerrit user]

 i18npool/inc/i18npool/lang.h        |    2 ++
 i18npool/source/isolang/isolang.cxx |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit ebcc02052d6fdfad59cdbcb4f18df0c007033999
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Dec 13 13:45:14 2012 +0100

    introduced [mul] multiple and [und] undetermined language codes
    
    Various places use an empty locale or string to indicate different
    meanings and/or variants of "this is not a real locale but I didn't know
    what to use else" or abuse LANGUAGE_DONTKNOW in one or the other way. In
    preparation of changing that awkward situation now offer the ISO 639
    codes for multiple languages [mul] and language undetermined [und],
    mapping to LANGUAGE_MULTIPLE and LANGUAGE_UNDETERMINED.
    
    Change-Id: I687de23ffc00a9a056f2837b024e0a62658e3df2
    (cherry picked from commit 09bc1464ec9dde61e69cca393e65e72143bdd383)

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index cf4ec6b..932f92b 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -566,6 +566,8 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_YOMBE                 0x0684
 #define LANGUAGE_USER_YOMBE_CONGO           0x8284  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_USER_YOMBE)) */
 #define LANGUAGE_USER_SIDAMA                0x0685
+#define LANGUAGE_MULTIPLE                   0xFFEF  /* multiple languages, primary 0x3ef, sub 0x3f */
+#define LANGUAGE_UNDETERMINED               0xFFF0  /* undetermined language, primary 0x3f0, sub 0x3f */
 #define LANGUAGE_USER_SYSTEM_CONFIG         0xFFFE  /* not a locale, to be used only in configuration context to obtain system default, primary 0x3fe, sub 0x3f */
 
 #endif /* INCLUDED_I18NPOOL_LANG_H */
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index 439590a..bbe3e0f 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -511,6 +511,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_YOMBE,                 "yom", "CD" },
     { LANGUAGE_USER_YOMBE_CONGO,           "yom", "CG" },
     { LANGUAGE_USER_SIDAMA,                "sid", "ET" },
+    { LANGUAGE_MULTIPLE,                   "mul", ""   },   // multiple languages, many languages are used
+    { LANGUAGE_UNDETERMINED,               "und", ""   },   // undetermined language, language cannot be identified
     { LANGUAGE_NONE,                       "zxx", ""   },   // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
     { LANGUAGE_DONTKNOW,                    "",   ""   }    // marks end of table
 };