[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/source

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx  |    2 +-
 i18nlangtag/source/isolang/mslangid.cxx |    1 +
 include/i18nlangtag/lang.h              |    2 +-
 svtools/source/misc/langtab.src         |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e0d86cff2b3314576c6cb857da06d6b6d217f89b
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Mar 15 18:49:07 2017 +0100

    tdf#105448 add Xibe [sjo-CN] to language list (and remove Sibe [nco-PG])
    
    ... the latter which was a misunderstanding and erroneous.
    
    Change-Id: I4ec8eaf14348aaaed43ea4578d46b5488279c85b

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index a35fef0..837fee44 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -666,7 +666,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_FRENCH_MAURITIUS,       "fr", "MU", 0     },
     { LANGUAGE_USER_SILESIAN,              "szl", "PL", 0     },
     { LANGUAGE_USER_MANCHU,                "mnc", "CN", 0     },
-    { LANGUAGE_USER_SIBE,                  "nco", "PG", 0     },
+    { LANGUAGE_USER_XIBE,                  "sjo", "CN", 0     },
     { LANGUAGE_MULTIPLE,                   "mul", ""  , 0     },    // multiple languages, many languages are used
     { LANGUAGE_UNDETERMINED,               "und", ""  , 0     },    // undetermined language, language cannot be identified
     { LANGUAGE_NONE,                       "zxx", ""  , 0     },    // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx
index 9552318..d13d7bb 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -360,6 +360,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
         case LANGUAGE_USER_KYRGYZ_CHINA:
         case LANGUAGE_USER_HUNGARIAN_ROVAS:
         case LANGUAGE_USER_MANCHU:
+        case LANGUAGE_USER_XIBE:
             nScript = css::i18n::ScriptType::COMPLEX;
             break;
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 3b39dee..0287c8d 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -719,7 +719,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_SILESIAN              0x0699
 #define LANGUAGE_USER_HUNGARIAN_ROVAS       0x800E  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_HUNGARIAN)) */
 #define LANGUAGE_USER_MANCHU                0x069A
-#define LANGUAGE_USER_SIBE                  0x069B
+#define LANGUAGE_USER_XIBE                  0x069B
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index deb6282..b3056b3 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -405,7 +405,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Hungarian (Szekely-Hungarian Rovas)" ; LANGUAGE_USER_HUNGARIAN_ROVAS ; > ;
         < "English (Malaysia)" ; LANGUAGE_ENGLISH_MALAYSIA ; > ;
         < "Manchu" ; LANGUAGE_USER_MANCHU ; > ;
-        < "Sibe" ; LANGUAGE_USER_SIBE ; > ;
+        < "Xibe" ; LANGUAGE_USER_XIBE ; > ;
     };
 };