You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2019/06/18 09:19:01 UTC
svn commit: r1861564 - in /openoffice/branches/AOO42X: ./
main/i18npool/inc/i18npool/lang.h main/i18npool/source/isolang/isolang.cxx
Author: mseidel
Date: Tue Jun 18 09:19:01 2019
New Revision: 1861564
URL: http://svn.apache.org/viewvc?rev=1861564&view=rev
Log:
Merged r1861563 from trunk
Additions for new language Amharic (am)
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/i18npool/inc/i18npool/lang.h
openoffice/branches/AOO42X/main/i18npool/source/isolang/isolang.cxx
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 18 09:19:01 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563
Modified: openoffice/branches/AOO42X/main/i18npool/inc/i18npool/lang.h
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/inc/i18npool/lang.h?rev=1861564&r1=1861563&r2=1861564&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/inc/i18npool/lang.h (original)
+++ openoffice/branches/AOO42X/main/i18npool/inc/i18npool/lang.h Tue Jun 18 09:19:01 2019
@@ -110,6 +110,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_AFRIKAANS 0x0436
#define LANGUAGE_ALBANIAN 0x041C
#define LANGUAGE_ALSATIAN_FRANCE 0x0484
+#define LANGUAGE_AMHARIC 0x005E
#define LANGUAGE_AMHARIC_ETHIOPIA 0x045E
#define LANGUAGE_ARABIC_ALGERIA 0x1401
#define LANGUAGE_ARABIC_BAHRAIN 0x3C01
Modified: openoffice/branches/AOO42X/main/i18npool/source/isolang/isolang.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/isolang/isolang.cxx?rev=1861564&r1=1861563&r2=1861564&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/isolang/isolang.cxx (original)
+++ openoffice/branches/AOO42X/main/i18npool/source/isolang/isolang.cxx Tue Jun 18 09:19:01 2019
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -34,21 +34,21 @@
struct IsoLangEngEntry
{
- LanguageType mnLang;
- sal_Char maCountry[3];
+ LanguageType mnLang;
+ sal_Char maCountry[3];
};
struct IsoLangNoneStdEntry
{
- LanguageType mnLang;
- sal_Char maLangStr[4];
- sal_Char maCountry[9];
+ LanguageType mnLang;
+ sal_Char maLangStr[4];
+ sal_Char maCountry[9];
};
struct IsoLangOtherEntry
{
- LanguageType mnLang;
- const sal_Char* mpLangStr;
+ LanguageType mnLang;
+ const sal_Char* mpLangStr;
};
// -----------------------------------------------------------------------
@@ -86,10 +86,10 @@ struct IsoLangOtherEntry
// language, see code. A call with "en-ZZ" (not in table) would still result in
// LANGUAGE_ENGLISH.
-/* erAck: 2007-07-05T20:01+0200 TODO: The entire suite's "primary language
+/* erAck: 2007-07-05T20:01+0200 TODO: The entire suite's "primary language
* only" usage and locale fall back should be cleaned up and made consistent. I
* strongly doubt that most callers exactly expect the behavior described.
- * Currently these primary LangIDs are used literally in OOo code:
+ * Currently these primary LangIDs are used literally in AOO code:
* LANGUAGE_ENGLISH LANGUAGE_CHINESE LANGUAGE_MALAY
* LANGUAGE_AZERI LANGUAGE_URDU LANGUAGE_KASHMIRI
*/
@@ -335,6 +335,7 @@ static MsLangId::IsoLangEntry const aImp
{ LANGUAGE_UIGHUR_CHINA, "ug", "CN" },
{ LANGUAGE_TIGRIGNA_ETHIOPIA, "ti", "ET" },
{ LANGUAGE_TIGRIGNA_ERITREA, "ti", "ER" },
+ { LANGUAGE_AMHARIC, "am", "" },
{ LANGUAGE_AMHARIC_ETHIOPIA, "am", "ET" },
{ LANGUAGE_GUARANI_PARAGUAY, "gug", "PY" },
{ LANGUAGE_HAWAIIAN_UNITED_STATES, "haw", "US" },
@@ -933,8 +934,8 @@ LanguageType MsLangId::convertIsoNamesTo
if ( pFirstLang )
return pFirstLang->mnLang;
- // if only the country is set, look for any entry matching the country
- // (to allow reading country and language in separate steps, in any order)
+ // if only the country is set, look for any entry matching the country
+ // (to allow reading country and language in separate steps, in any order)
if ( rCountry.getLength() && !rLang.getLength() )
{
const IsoLangEntry* pEntry2 = aImplIsoLangEntries;