summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-01-30 17:26:21 +0100
committerEike Rathke <erack@redhat.com>2017-01-30 17:34:19 +0100
commit608b749f27a38c267b599968e60dd87bbd9abde6 (patch)
tree6c928d7915ac133b6cfea3cba9e4b20dccde00c0
parent8d664db1372e7b260cba0e3ad5df5840af05c764 (diff)
tdf#105448 add Manchu [mnc-CN] to language list (CTL)
Change-Id: Ia19da31a3df0a7d196997eedef07d8a28aa2e72c
-rw-r--r--i18nlangtag/source/isolang/isolang.cxx1
-rw-r--r--i18nlangtag/source/isolang/mslangid.cxx1
-rw-r--r--include/i18nlangtag/lang.h1
-rw-r--r--svtools/source/misc/langtab.src1
4 files changed, 4 insertions, 0 deletions
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 435a220ee723..70cf7d696f91 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -664,6 +664,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_ENGLISH_MAURITIUS, "en", "MU", 0 },
{ LANGUAGE_USER_FRENCH_MAURITIUS, "fr", "MU", 0 },
{ LANGUAGE_USER_SILESIAN, "szl", "PL", 0 },
+ { LANGUAGE_USER_MANCHU, "mnc", "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 280d21f11ba5..7d53cd0bc974 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -359,6 +359,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
case LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ:
case LANGUAGE_USER_KYRGYZ_CHINA:
case LANGUAGE_USER_HUNGARIAN_ROVAS:
+ case LANGUAGE_USER_MANCHU:
nScript = css::i18n::ScriptType::COMPLEX;
break;
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index eeca00cc91f3..fe4eacf5d742 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -718,6 +718,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_FRENCH_MAURITIUS 0x900C /* makeLangID( 0x24, getPrimaryLanguage( LANGUAGE_FRENCH)) */
#define LANGUAGE_USER_SILESIAN 0x0699
#define LANGUAGE_USER_HUNGARIAN_ROVAS 0x800E /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_HUNGARIAN)) */
+#define LANGUAGE_USER_MANCHU 0x069A
/* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 67e5f0a58764..6ff69e7629b5 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -404,6 +404,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Silesian" ; LANGUAGE_USER_SILESIAN ; > ;
< "Hungarian (Szekely-Hungarian Rovas)" ; LANGUAGE_USER_HUNGARIAN_ROVAS ; > ;
< "English (Malaysia)" ; LANGUAGE_ENGLISH_MALAYSIA ; > ;
+ < "Manchu" ; LANGUAGE_USER_MANCHU ; > ;
};
};