diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-30 10:23:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-30 14:07:28 +0200 |
| commit | 6ed854fa980804e71365c82821131bbe0cc9708c (patch) | |
| tree | 7d170c5c1b316c0a8587c7ed3751ac7aeaa3d5fb | |
| parent | f6dda4e1603ee1d901bf747c60f232db1f1b56a5 (diff) | |
drop LANGUAGE_USER_MALAGASY_PLATEAU define
since it's just an alias for LANGUAGE_MALAGASY_PLATEAU,
at least as far back as
commit 6b678c135da07f34da1bf7b19562366361e95085
"added/checked/aligned MS-LangIDs and mappings from new MS-LCID.pdf"
Change-Id: I18645160cb1808c967fd6efd36e1d4269e4734ff
Reviewed-on: https://gerrit.libreoffice.org/38187
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/i18nlangtag/lang.h | 3 | ||||
| -rw-r--r-- | svtools/source/misc/langtab.src | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index f57e648bba54..07cb601e9d78 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -294,7 +294,7 @@ constexpr LanguageType primary(LanguageType lt) { return LanguageType(sal_uInt16 #define LANGUAGE_LU_CHINA LanguageType(0x0490) #define LANGUAGE_LUXEMBOURGISH_LUXEMBOURG LanguageType(0x046E) /* obsoletes LANGUAGE_USER_LUXEMBOURGISH 0x0630 */ #define LANGUAGE_MACEDONIAN LanguageType(0x042F) -#define LANGUAGE_MALAGASY_PLATEAU LanguageType(0x048D) /* obsoletes LANGUAGE_USER_MALAGASY_PLATEAU 0x064F */ +#define LANGUAGE_MALAGASY_PLATEAU LanguageType(0x048D) /* obsoletes LANGUAGE_OBSOLETE_USER_MALAGASY_PLATEAU */ #define LANGUAGE_MALAYALAM LanguageType(0x044C) /* in India */ #define LANGUAGE_MALAY_BRUNEI_DARUSSALAM LanguageType(0x083E) #define LANGUAGE_MALAY_MALAYSIA LanguageType(0x043E) @@ -620,7 +620,6 @@ constexpr LanguageType primary(LanguageType lt) { return LanguageType(sal_uInt16 #define LANGUAGE_USER_BUSHI LanguageType(0x064D) #define LANGUAGE_USER_TAHITIAN LanguageType(0x064E) #define LANGUAGE_OBSOLETE_USER_MALAGASY_PLATEAU LanguageType(0x064F) -#define LANGUAGE_USER_MALAGASY_PLATEAU LANGUAGE_MALAGASY_PLATEAU #define LANGUAGE_USER_PAPIAMENTU_ARUBA LanguageType(0x8079) /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_PAPIAMENTU)) */ #define LANGUAGE_USER_SARDINIAN_CAMPIDANESE LanguageType(0x0650) #define LANGUAGE_USER_SARDINIAN_GALLURESE LanguageType(0x0651) diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index ec44fb76be1c..ebdffae445a9 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -301,7 +301,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Maore" ; LANGUAGE_USER_MAORE ; > ; < "Bushi" ; LANGUAGE_USER_BUSHI ; > ; < "Tahitian" ; LANGUAGE_USER_TAHITIAN ; > ; - < "Malagasy, Plateau" ; LANGUAGE_USER_MALAGASY_PLATEAU ; > ; + < "Malagasy, Plateau" ; LANGUAGE_MALAGASY_PLATEAU ; > ; < "Papiamentu (Netherlands Antilles)" ; LANGUAGE_PAPIAMENTU ; > ; < "Papiamento (Aruba)" ; LANGUAGE_USER_PAPIAMENTU_ARUBA ; > ; < "Sardinian, Campidanese" ; LANGUAGE_USER_SARDINIAN_CAMPIDANESE ; > ; |