bin/lo-xlate-lang | 2
comphelper/source/misc/string.cxx | 2
connectivity/source/drivers/hsqldb/HDriver.cxx | 2
filter/source/msfilter/countryid.cxx | 2
filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 4
i18nlangtag/source/isolang/isolang.cxx | 2
i18nlangtag/source/isolang/mslangid.cxx | 2
i18npool/source/breakiterator/data/char.txt | 8 -
i18npool/source/breakiterator/data/char_in.txt | 8 -
i18npool/source/localedata/data/or_IN.xml | 2
i18npool/source/nativenumber/data/numberchar.h | 8 -
i18nutil/source/utility/unicode_data.h | 2
include/i18nlangtag/lang.h | 2
include/svx/ucsubset.hrc | 2
include/vcl/fontcapabilities.hxx | 2
l10ntools/source/ulfconv/msi-encodinglist.txt | 2
linguistic/source/misc.cxx | 2
scp2/source/accessories/module_samples_accessories.ulf | 8 -
scp2/source/accessories/module_templates_accessories.ulf | 8 -
scp2/source/ooo/module_helppack.ulf | 4
scp2/source/ooo/module_langpack.ulf | 4
setup_native/source/win32/customactions/sellang/sellang.cxx | 2
shell/source/win32/shlxthandler/util/utilities.cxx | 2
svtools/source/misc/langtab.src | 2
svtools/source/misc/sampletext.cxx | 8 -
svx/source/dialog/charmap.cxx | 2
svx/source/dialog/ucsubset.src | 4
vcl/source/fontsubset/sft.cxx | 77 ----------
vcl/source/gdi/sallayout.cxx | 4
vcl/win/source/gdi/salgdi3.cxx | 2
30 files changed, 52 insertions(+), 129 deletions(-)
New commits:
commit 108eee306ea0beef1e8cc5e673a72db0928dd6b8
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 11 13:24:22 2013 +0000
Related: rhbz#1040291 Change language name from 'Oriya' to 'Odia'
Except for our external api where the Oriya is stuck (and similar for
the vba implementation)
Change-Id: I8288c930567385eea49a4c303727b13ef8b8a89f
diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang
index ede1b65..b7a2879 100755
--- a/bin/lo-xlate-lang
+++ b/bin/lo-xlate-lang
@@ -144,7 +144,7 @@ __DATA__
:as:assamese
:ml:malayalam
:mr:marathi
-:or:oriya
+:or:odia
:ur:urdu
:fa:farsi
:lv:latvian
diff --git a/comphelper/source/misc/string.cxx
b/comphelper/source/misc/string.cxx
index 4a5f9df..ae622c2 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.cxx
@@ -217,7 +217,7 @@ sal_uInt32 decimalStringToNumber(
value = c - 0x0C66;
else if( c >= 0x0BE6 ) // tamil digits
value = c - 0x0BE6;
- else if( c >= 0x0B66 ) // oriya digits
+ else if( c >= 0x0B66 ) // odia digits
value = c - 0x0B66;
else if( c >= 0x0AE6 ) // gujarati digits
value = c - 0x0AE6;
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 1e7b6b4..3e2fd0d 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -755,7 +755,7 @@ namespace connectivity
"ne-NP", "Nepali",
"nl-NL", "Dutch",
"nn-NO", "Norwegian",
- "or-IN", "Oriya",
+ "or-IN", "Odia",
"pa-IN", "Punjabi",
"pl-PL", "Polish",
"ps-AF", "Pashto",
diff --git a/filter/source/msfilter/countryid.cxx
b/filter/source/msfilter/countryid.cxx
index b36f51b..28b57b3 100644
--- a/filter/source/msfilter/countryid.cxx
+++ b/filter/source/msfilter/countryid.cxx
@@ -147,7 +147,7 @@ static const CountryEntry pTable[] =
{ COUNTRY_INDIA, LANGUAGE_URDU_INDIA,
true },
{ COUNTRY_INDIA, LANGUAGE_PUNJABI,
false },
{ COUNTRY_INDIA, LANGUAGE_GUJARATI,
false },
- { COUNTRY_INDIA, LANGUAGE_ORIYA,
false },
+ { COUNTRY_INDIA, LANGUAGE_ODIA,
false },
{ COUNTRY_INDIA, LANGUAGE_TAMIL,
false },
{ COUNTRY_INDIA, LANGUAGE_TELUGU,
false },
{ COUNTRY_INDIA, LANGUAGE_KANNADA,
false },
diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 8869952..88f0d8a 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -1268,7 +1268,7 @@
<xsl:attribute
name="number:transliteration-language">gu</xsl:attribute>
<xsl:attribute
name="number:transliteration-country">IN</xsl:attribute>
</xsl:when>
- <!-- Oriya (India), #08 -->
+ <!-- Odia (India), #08 -->
<xsl:when test="$number-shape-code = 8">
<xsl:attribute
name="number:transliteration-language">or</xsl:attribute>
<xsl:attribute
name="number:transliteration-country">IN</xsl:attribute>
@@ -2102,7 +2102,7 @@
<xsl:attribute
name="number:country">NO</xsl:attribute>
</xsl:when>
<xsl:when test="$language-country-code = 1096">
- <!-- Oriya (India), #0448 -->
+ <!-- Odia (India), #0448 -->
<xsl:attribute
name="number:language">or</xsl:attribute>
<xsl:attribute
name="number:country">IN</xsl:attribute>
</xsl:when>
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 2611dbb..2109928 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -347,7 +347,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_KONKANI, "kok", "IN", 0 },
{ LANGUAGE_NEPALI, "ne", "NP", 0 },
{ LANGUAGE_NEPALI_INDIA, "ne", "IN", 0 },
- { LANGUAGE_ORIYA, "or", "IN", 0 },
+ { LANGUAGE_ODIA, "or", "IN", 0 },
{ LANGUAGE_PUNJABI, "pa", "IN", 0 },
{ LANGUAGE_SANSKRIT, "sa", "IN", 0 },
{ LANGUAGE_TAMIL, "ta", "IN", 0 },
diff --git a/i18nlangtag/source/isolang/mslangid.cxx
b/i18nlangtag/source/isolang/mslangid.cxx
index 772822e..4f86492 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -393,7 +393,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
case LANGUAGE_MANIPURI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_MARATHI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_NEPALI & LANGUAGE_MASK_PRIMARY:
- case LANGUAGE_ORIYA & LANGUAGE_MASK_PRIMARY:
+ case LANGUAGE_ODIA & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_PUNJABI & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_SANSKRIT & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_SINDHI & LANGUAGE_MASK_PRIMARY:
diff --git a/i18npool/source/breakiterator/data/char.txt
b/i18npool/source/breakiterator/data/char.txt
index 6ab8803..ccc1bee 100644
--- a/i18npool/source/breakiterator/data/char.txt
+++ b/i18npool/source/breakiterator/data/char.txt
@@ -36,8 +36,8 @@ $KannadaLetter = [\u0C85-\u0CB9 \u0CDE-\u0CE1];
$KannadaSignVirama = \u0CCD;
$MalayalamLetter = [\u0D05-\u0D39 \u0D60-\u0D61 \u0D7A-\u0D7F];
$MalayalamSignVirama = \u0D4D;
-$OriyaLetter = [\u0B05-\u0B39 \u0B5C-\u0B61 \u0B71];
-$OriyaSignVirama = \u0B4D;
+$OdiaLetter = [\u0B05-\u0B39 \u0B5C-\u0B61 \u0B71];
+$OdiaSignVirama = \u0B4D;
$GurmukhiLetter = [\u0A05-\u0A39 \u0A59-\u0A5E];
$GurmukhiSignVirama = \u0A4D;
$TamilKa = \u0B95;
@@ -69,7 +69,7 @@ $GujaratiLetter ($GujaratiSignVirama $GujaratiLetter?)+;
$DevanagariLetter ($DevanagariSignVirama $DevanagariLetter?)+;
$KannadaLetter ($KannadaSignVirama $KannadaLetter?)+;
$MalayalamLetter ($MalayalamSignVirama $MalayalamLetter?)+;
-$OriyaLetter ($OriyaSignVirama $OriyaLetter?)+;
+$OdiaLetter ($OdiaSignVirama $OdiaLetter?)+;
$GurmukhiLetter ($GurmukhiSignVirama $GurmukhiLetter?)+;
$TamilKa $TamilSignVirama $TamilSsa;
$TeluguLetter ($TeluguSignVirama $TeluguLetter?)+;
@@ -94,7 +94,7 @@ $LF $CR;
($DevanagariLetter? $DevanagariSignVirama)+ $DevanagariLetter;
($KannadaLetter? $KannadaSignVirama)+ $KannadaLetter;
($MalayalamLetter? $MalayalamSignVirama)+ $MalayalamLetter;
-($OriyaLetter? $OriyaSignVirama)+ $OriyaLetter;
+($OdiaLetter? $OdiaSignVirama)+ $OdiaLetter;
($GurmukhiLetter? $GurmukhiSignVirama)+ $GurmukhiLetter;
$TamilSsa $TamilSignVirama $TamilKa;
($TeluguLetter? $TeluguSignVirama)+ $TeluguLetter;
diff --git a/i18npool/source/breakiterator/data/char_in.txt
b/i18npool/source/breakiterator/data/char_in.txt
index e791055..4142595 100644
--- a/i18npool/source/breakiterator/data/char_in.txt
+++ b/i18npool/source/breakiterator/data/char_in.txt
@@ -28,8 +28,8 @@ $KannadaLetter = [\u0C85-\u0CB9 \u0CDE-\u0CE1];
$KannadaSignVirama = \u0CCD;
$MalayalamLetter = [\u0D05-\u0D39 \u0D60-\u0D61 \u0D7A-\u0D7F];
$MalayalamSignVirama = \u0D4D;
-$OriyaLetter = [\u0B05-\u0B39 \u0B5C-\u0B61 \u0B71];
-$OriyaSignVirama = \u0B4D;
+$OdiaLetter = [\u0B05-\u0B39 \u0B5C-\u0B61 \u0B71];
+$OdiaSignVirama = \u0B4D;
$GurmukhiLetter = [\u0A05-\u0A39 \u0A59-\u0A5E];
$GurmukhiSignVirama = \u0A4D;
$TamilKa = \u0B95;
@@ -61,7 +61,7 @@ $GujaratiLetter ($GujaratiSignVirama $GujaratiLetter?)+;
$DevanagariLetter ($DevanagariSignVirama $DevanagariLetter?)+;
$KannadaLetter ($KannadaSignVirama $KannadaLetter?)+;
$MalayalamLetter ($MalayalamSignVirama $MalayalamLetter?)+;
-$OriyaLetter ($OriyaSignVirama $OriyaLetter?)+;
+$OdiaLetter ($OdiaSignVirama $OdiaLetter?)+;
$GurmukhiLetter ($GurmukhiSignVirama $GurmukhiLetter?)+;
$TamilKa $TamilSignVirama $TamilSsa;
$TeluguLetter ($TeluguSignVirama $TeluguLetter?)+;
@@ -85,7 +85,7 @@ $LF $CR;
($DevanagariLetter? $DevanagariSignVirama)+ $DevanagariLetter;
($KannadaLetter? $KannadaSignVirama)+ $KannadaLetter;
($MalayalamLetter? $MalayalamSignVirama)+ $MalayalamLetter;
-($OriyaLetter? $OriyaSignVirama)+ $OriyaLetter;
+($OdiaLetter? $OdiaSignVirama)+ $OdiaLetter;
($GurmukhiLetter? $GurmukhiSignVirama)+ $GurmukhiLetter;
$TamilSsa $TamilSignVirama $TamilKa;
($TeluguLetter? $TeluguSignVirama)+ $TeluguLetter;
diff --git a/i18npool/source/localedata/data/or_IN.xml
b/i18npool/source/localedata/data/or_IN.xml
index 57a67bc..855c398 100644
--- a/i18npool/source/localedata/data/or_IN.xml
+++ b/i18npool/source/localedata/data/or_IN.xml
@@ -21,7 +21,7 @@
<LC_INFO>
<Language>
<LangID>or</LangID>
- <DefaultName>Oriya</DefaultName>
+ <DefaultName>Odia</DefaultName>
</Language>
<Country>
<CountryID>IN</CountryID>
diff --git a/i18npool/source/nativenumber/data/numberchar.h
b/i18npool/source/nativenumber/data/numberchar.h
index 4052b4d..48d0285 100644
--- a/i18npool/source/nativenumber/data/numberchar.h
+++ b/i18npool/source/nativenumber/data/numberchar.h
@@ -70,7 +70,7 @@ static const sal_Unicode NumberChar[][10] = {
{ 0x06F0, 0x06F1, 0x06F2, 0x06F3, 0x06F4, 0x06F5, 0x06F6, 0x06F7, 0x06F8,
0x06F9 }, // Est. Arabic Indic
{ 0x0966, 0x0967, 0x0968, 0x0969, 0x096A, 0x096B, 0x096C, 0x096D, 0x096E,
0x096F }, // Indic (Devanagari)
{ 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, 0x0E58,
0x0E59 }, // Thai
- { 0x0866, 0x0867, 0x0868, 0x0869, 0x086A, 0x086B, 0x086C, 0x086D, 0x086E,
0x086F }, // Oriya
+ { 0x0866, 0x0867, 0x0868, 0x0869, 0x086A, 0x086B, 0x086C, 0x086D, 0x086E,
0x086F }, // Odia
{ 0x0966, 0x0967, 0x0968, 0x0969, 0x096A, 0x096B, 0x096C, 0x096D, 0x096E,
0x096F }, // Marathi
{ 0x09E6, 0x09E7, 0x09E8, 0x09E9, 0x09EA, 0x09EB, 0x09EC, 0x09ED, 0x09EE,
0x09EF }, // Bengali
{ 0x0A66, 0x0A67, 0x0A68, 0x0A69, 0x0A6A, 0x0A6B, 0x0A6C, 0x0A6D, 0x0A6E,
0x0A6F }, // Punjabi (Gurmukhi)
@@ -104,7 +104,7 @@ static sal_Unicode DecimalChar[] = {
0x066B, // Est. Arabic Indic
0x0000, // Indic (Devanagari)
0x0000, // Thai
- 0x0000, // Oriya
+ 0x0000, // Odia
0x0000, // Marathi
0x0000, // Bengali
0x0000, // Punjabi (Gurmukhi)
@@ -138,7 +138,7 @@ static const sal_Unicode MinusChar[] = {
0x2212, // Est. Arabic Indic
0x0000, // Indic
0x0000, // Thai
- 0x0000, // Oriya
+ 0x0000, // Odia
0x0000, // Marathi
0x0000, // Bengali
0x0000, // Punjabi
@@ -172,7 +172,7 @@ static sal_uInt16 SeparatorChar[] = {
0x066C, // Est. Arabic Indic
0x0000, // Indic
0x0000, // Thai
- 0x0000, // Oriya
+ 0x0000, // Odia
0x0000, // Marathi
0x0000, // Bengali
0x0000, // Punjabi
diff --git a/i18nutil/source/utility/unicode_data.h
b/i18nutil/source/utility/unicode_data.h
index e7a192f..67f7a25 100644
--- a/i18nutil/source/utility/unicode_data.h
+++ b/i18nutil/source/utility/unicode_data.h
@@ -1567,7 +1567,7 @@ static const sal_Unicode UnicodeScriptType[][2] = {
{0x0980, 0x09ff}, // 15. Bengali
{0x0a00, 0x0a7f}, // 16. Gurmukhi
{0x0a80, 0x0aff}, // 17. Gujarati
- {0x0b00, 0x0b7f}, // 18. Oriya
+ {0x0b00, 0x0b7f}, // 18. Odia
{0x0b80, 0x0bff}, // 19. Tamil
{0x0c00, 0x0c7f}, // 20. Telugu
{0x0c80, 0x0cff}, // 21. Kannada
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index be71b0a..f936fce 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -310,7 +310,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_NORWEGIAN_NYNORSK 0x0814
#define LANGUAGE_NORWEGIAN_NYNORSK_LSO 0x7814
#define LANGUAGE_OCCITAN_FRANCE 0x0482 /* obsoletes
LANGUAGE_USER_OCCITAN 0x0625 */
-#define LANGUAGE_ORIYA 0x0448
+#define LANGUAGE_ODIA 0x0448
#define LANGUAGE_OROMO 0x0472
#define LANGUAGE_PAPIAMENTU 0x0479
#define LANGUAGE_PASHTO 0x0463
diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc
index f41d223..5b1fb0e 100644
--- a/include/svx/ucsubset.hrc
+++ b/include/svx/ucsubset.hrc
@@ -43,7 +43,7 @@
#define RID_SUBSETSTR_BENGALI (RID_SUBSET_START + 16)
#define RID_SUBSETSTR_GURMUKHI (RID_SUBSET_START + 17)
#define RID_SUBSETSTR_GUJARATI (RID_SUBSET_START + 18)
-#define RID_SUBSETSTR_ORIYA (RID_SUBSET_START + 19)
+#define RID_SUBSETSTR_ODIA (RID_SUBSET_START + 19)
#define RID_SUBSETSTR_TAMIL (RID_SUBSET_START + 20)
#define RID_SUBSETSTR_TELUGU (RID_SUBSET_START + 21)
#define RID_SUBSETSTR_KANNADA (RID_SUBSET_START + 22)
diff --git a/include/vcl/fontcapabilities.hxx b/include/vcl/fontcapabilities.hxx
index 3fa3045..069afff 100644
--- a/include/vcl/fontcapabilities.hxx
+++ b/include/vcl/fontcapabilities.hxx
@@ -39,7 +39,7 @@ namespace vcl
BENGALI = 16,
GURMUKHI = 17,
GUJARATI = 18,
- ORIYA = 19,
+ ODIA = 19,
TAMIL = 20,
TELUGU = 21,
KANNADA = 22,
diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt
b/l10ntools/source/ulfconv/msi-encodinglist.txt
index f18b2cc..e83e95a 100644
--- a/l10ntools/source/ulfconv/msi-encodinglist.txt
+++ b/l10ntools/source/ulfconv/msi-encodinglist.txt
@@ -113,7 +113,7 @@ nso 0 1132
ny 0 1598
oc 0 1154 # Occitan-lengadocian
om 0 2162
-or 0 1096 # Oriya
+or 0 1096 # Odia
or-IN 0 1096
pa-IN 0 1094 # Punjabi
pap 0 2171
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index c7d208d..53f95b3 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -653,7 +653,7 @@ static const sal_uInt32 the_aDigitZeroes [] =
0x000009E6, //09EF ; Decimal # Nd [10] BENGALI DIGIT ZERO..BENGALI
DIGIT NINE
0x00000A66, //0A6F ; Decimal # Nd [10] GURMUKHI DIGIT ZERO..GURMUKHI
DIGIT NINE
0x00000AE6, //0AEF ; Decimal # Nd [10] GUJARATI DIGIT ZERO..GUJARATI
DIGIT NINE
- 0x00000B66, //0B6F ; Decimal # Nd [10] ORIYA DIGIT ZERO..ORIYA DIGIT
NINE
+ 0x00000B66, //0B6F ; Decimal # Nd [10] ODIA DIGIT ZERO..ODIA DIGIT NINE
0x00000BE6, //0BEF ; Decimal # Nd [10] TAMIL DIGIT ZERO..TAMIL DIGIT
NINE
0x00000C66, //0C6F ; Decimal # Nd [10] TELUGU DIGIT ZERO..TELUGU DIGIT
NINE
0x00000CE6, //0CEF ; Decimal # Nd [10] KANNADA DIGIT ZERO..KANNADA
DIGIT NINE
diff --git a/scp2/source/accessories/module_samples_accessories.ulf
b/scp2/source/accessories/module_samples_accessories.ulf
index fa43ca3..709f208 100644
--- a/scp2/source/accessories/module_samples_accessories.ulf
+++ b/scp2/source/accessories/module_samples_accessories.ulf
@@ -295,16 +295,16 @@ en-US = "Bengali (India)"
en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_LANGPACK_OR]
-en-US = "Oriya"
+en-US = "Odia"
[STR_DESC_MODULE_LANGPACK_OR]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs Odia support in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_LANGPACK_OR_IN]
-en-US = "Oriya"
+en-US = "Odia"
[STR_DESC_MODULE_LANGPACK_OR_IN]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs Odia support in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_LANGPACK_MR]
en-US = "Marathi"
diff --git a/scp2/source/accessories/module_templates_accessories.ulf
b/scp2/source/accessories/module_templates_accessories.ulf
index ff390e6..7ba6ba3 100644
--- a/scp2/source/accessories/module_templates_accessories.ulf
+++ b/scp2/source/accessories/module_templates_accessories.ulf
@@ -290,16 +290,16 @@ en-US = "Bengali (India)"
en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_LANGPACK_OR]
-en-US = "Oriya"
+en-US = "Odia"
[STR_DESC_MODULE_LANGPACK_OR]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs Odia support in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_LANGPACK_OR_IN]
-en-US = "Oriya"
+en-US = "Odia"
[STR_DESC_MODULE_LANGPACK_OR_IN]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs Odia support in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_LANGPACK_MR]
en-US = "Marathi"
diff --git a/scp2/source/ooo/module_helppack.ulf
b/scp2/source/ooo/module_helppack.ulf
index 0a0156a..13e9ddd 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -257,10 +257,10 @@ en-US = "Bengali (India)"
en-US = "Installs Bengali (India) help in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_HELPPACK_OR]
-en-US = "Oriya"
+en-US = "Odia"
[STR_DESC_MODULE_HELPPACK_OR]
-en-US = "Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs Odia help in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_HELPPACK_MR]
en-US = "Marathi"
diff --git a/scp2/source/ooo/module_langpack.ulf
b/scp2/source/ooo/module_langpack.ulf
index e146fda..37e911e 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -263,10 +263,10 @@ en-US = "Bengali (India)"
en-US = "Installs the Bengali (India) user interface"
[STR_NAME_MODULE_LANGPACK_OR]
-en-US = "Oriya"
+en-US = "Odia"
[STR_DESC_MODULE_LANGPACK_OR]
-en-US = "Installs the Oriya user interface"
+en-US = "Installs the Odia user interface"
[STR_NAME_MODULE_LANGPACK_MR]
en-US = "Marathi"
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx
b/setup_native/source/win32/customactions/sellang/sellang.cxx
index e9c4c57..6cb942c 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -112,7 +112,7 @@ langid_to_string( LANGID langid )
CASE(ne, NEPALI);
CASE(nl, DUTCH);
CASE(ns, SOTHO);
- CASE(or, ORIYA);
+ CASE(or, ODIA);
CASE(pa, PUNJABI);
CASE(pl, POLISH);
CASE(pt, PORTUGUESE);
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx
b/shell/source/win32/shlxthandler/util/utilities.cxx
index 6fc7800..e9fdef5 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -543,7 +543,7 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale )
else if ( wsLanguage == L"gu" )
usPrimaryLang = LANG_GUJARATI; //Gujarati
else if ( wsLanguage == L"or" )
- usPrimaryLang = LANG_ORIYA; //Not supported.
+ usPrimaryLang = LANG_ODIA; //Not supported.
else if ( wsLanguage == L"ta" )
usPrimaryLang = LANG_TAMIL; //Tamil
else if ( wsLanguage == L"te" )
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 3e51f60..93ebdaa 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -141,7 +141,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Nepali (India)" ; LANGUAGE_NEPALI_INDIA ; > ;
< "Norwegian, Bokmål" ; LANGUAGE_NORWEGIAN_BOKMAL ; > ;
< "Norwegian, Nynorsk" ; LANGUAGE_NORWEGIAN_NYNORSK ; > ;
- < "Oriya" ; LANGUAGE_ORIYA ; > ;
+ < "Odia" ; LANGUAGE_ODIA ; > ;
< "Polish" ; LANGUAGE_POLISH ; > ;
< "Portuguese (Angola)" ; LANGUAGE_USER_PORTUGUESE_ANGOLA ; > ;
< "Portuguese (Portugal)" ; LANGUAGE_PORTUGUESE ; > ;
diff --git a/svtools/source/misc/sampletext.cxx
b/svtools/source/misc/sampletext.cxx
index d74cad4..95a4d72 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -538,7 +538,7 @@ OUString makeRepresentativeTextForLanguage(LanguageType
eLang)
case LANGUAGE_GUJARATI & LANGUAGE_MASK_PRIMARY:
sRet = makeRepresentativeTextForScript(USCRIPT_GUJARATI);
break;
- case LANGUAGE_ORIYA & LANGUAGE_MASK_PRIMARY:
+ case LANGUAGE_ODIA & LANGUAGE_MASK_PRIMARY:
sRet = makeRepresentativeTextForScript(USCRIPT_ORIYA);
break;
case LANGUAGE_TAMIL & LANGUAGE_MASK_PRIMARY:
@@ -667,8 +667,8 @@ namespace
fprintf(stderr, "GURMUKHI\n");
if (rIn[vcl::UnicodeCoverage::GUJARATI])
fprintf(stderr, "GUJARATI\n");
- if (rIn[vcl::UnicodeCoverage::ORIYA])
- fprintf(stderr, "ORIYA\n");
+ if (rIn[vcl::UnicodeCoverage::ODIA])
+ fprintf(stderr, "ODIA\n");
if (rIn[vcl::UnicodeCoverage::TAMIL])
fprintf(stderr, "TAMIL\n");
if (rIn[vcl::UnicodeCoverage::TELUGU])
@@ -1226,7 +1226,7 @@ UScriptCode
otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCove
case vcl::UnicodeCoverage::GUJARATI:
eRet = USCRIPT_GUJARATI;
break;
- case vcl::UnicodeCoverage::ORIYA:
+ case vcl::UnicodeCoverage::ODIA:
eRet = USCRIPT_ORIYA;
break;
case vcl::UnicodeCoverage::TAMIL:
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 7315edf..facf4d9 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -861,7 +861,7 @@ void SubsetMap::InitList()
aAllSubsets.push_back( Subset( 0x0A80, 0x0AFF,
RID_SUBSETSTR_GUJARATI ) );
break;
case UBLOCK_ORIYA:
- aAllSubsets.push_back( Subset( 0x0B00, 0x0B7F,
RID_SUBSETSTR_ORIYA ) );
+ aAllSubsets.push_back( Subset( 0x0B00, 0x0B7F,
RID_SUBSETSTR_ODIA ) );
break;
case UBLOCK_TAMIL:
aAllSubsets.push_back( Subset( 0x0B80, 0x0BFF,
RID_SUBSETSTR_TAMIL ) );
diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src
index 15b283d..a658396 100644
--- a/svx/source/dialog/ucsubset.src
+++ b/svx/source/dialog/ucsubset.src
@@ -103,9 +103,9 @@ Resource RID_SUBSETMAP
{
Text [ en-US ] = "Gujarati";
};
- String RID_SUBSETSTR_ORIYA
+ String RID_SUBSETSTR_ODIA
{
- Text [ en-US ] = "Oriya";
+ Text [ en-US ] = "Odia";
};
String RID_SUBSETSTR_TAMIL
{
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 5bd27fa..6e0f9bf 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -303,8 +303,8 @@ VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar,
LanguageType eLang )
case LANGUAGE_BURMESE & LANGUAGE_MASK_PRIMARY:
nOffset = 0x1040 - '0'; // myanmar
break;
- case LANGUAGE_ORIYA & LANGUAGE_MASK_PRIMARY:
- nOffset = 0x0B66 - '0'; // oriya
+ case LANGUAGE_ODIA & LANGUAGE_MASK_PRIMARY:
+ nOffset = 0x0B66 - '0'; // odia
break;
case LANGUAGE_TAMIL & LANGUAGE_MASK_PRIMARY:
nOffset = 0x0BE7 - '0'; // tamil
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 97cc98b..4c804fa 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -313,7 +313,7 @@ static Unicode2LangType aLangFromCodeChart[]= {
{0x0900, 0x097F, LANGUAGE_HINDI}, // Devanagari
{0x0980, 0x09FF, LANGUAGE_BENGALI}, // Bengali
{0x0A80, 0x0AFF, LANGUAGE_GUJARATI}, // Gujarati
- {0x0B00, 0x0B7F, LANGUAGE_ORIYA}, // Oriya
+ {0x0B00, 0x0B7F, LANGUAGE_ODIA}, // Odia
{0x0B80, 0x0BFF, LANGUAGE_TAMIL}, // Tamil
{0x0C00, 0x0C7F, LANGUAGE_TELUGU}, // Telugu
{0x0C80, 0x0CFF, LANGUAGE_KANNADA}, // Kannada
commit bd43733860699d9f9f5b28f15a442b272d6f77e1
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 11 13:17:13 2013 +0000
drop unused ulcodes
Change-Id: I075db734dae73244d90a39b655fca2dc48d921c7
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 9880b7b..1fd3e8f 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -137,83 +137,6 @@ static const sal_uInt32 T_otto = 0x4f54544f; /*
'OTTO' */
#define T_gsub 0x47535542
#define T_CFF 0x43464620
-#define LAST_URANGE_BIT 69
-const char *ulcodes[LAST_URANGE_BIT+2] = {
- /* 0 */ "Basic Latin",
- /* 1 */ "Latin-1 Supplement",
- /* 2 */ "Latin Extended-A",
- /* 3 */ "Latin Extended-B",
- /* 4 */ "IPA Extensions",
- /* 5 */ "Spacing Modifier Letters",
- /* 6 */ "Combining Diacritical Marks",
- /* 7 */ "Basic Greek",
- /* 8 */ "Greek Symbols And Coptic",
- /* 9 */ "Cyrillic",
- /* 10 */ "Armenian",
- /* 11 */ "Basic Hebrew",
- /* 12 */ "Hebrew Extended (A and B blocks combined)",
- /* 13 */ "Basic Arabic",
- /* 14 */ "Arabic Extended",
- /* 15 */ "Devanagari",
- /* 16 */ "Bengali",
- /* 17 */ "Gurmukhi",
- /* 18 */ "Gujarati",
- /* 19 */ "Oriya",
- /* 20 */ "Tamil",
- /* 21 */ "Telugu",
- /* 22 */ "Kannada",
- /* 23 */ "Malayalam",
- /* 24 */ "Thai",
- /* 25 */ "Lao",
- /* 26 */ "Basic Georgian",
- /* 27 */ "Georgian Extended",
- /* 28 */ "Hangul Jamo",
- /* 29 */ "Latin Extended Additional",
- /* 30 */ "Greek Extended",
- /* 31 */ "General Punctuation",
- /* 32 */ "Superscripts And Subscripts",
- /* 33 */ "Currency Symbols",
- /* 34 */ "Combining Diacritical Marks For Symbols",
- /* 35 */ "Letterlike Symbols",
- /* 36 */ "Number Forms",
- /* 37 */ "Arrows",
- /* 38 */ "Mathematical Operators",
- /* 39 */ "Miscellaneous Technical",
- /* 40 */ "Control Pictures",
- /* 41 */ "Optical Character Recognition",
- /* 42 */ "Enclosed Alphanumerics",
- /* 43 */ "Box Drawing",
- /* 44 */ "Block Elements",
- /* 45 */ "Geometric Shapes",
- /* 46 */ "Miscellaneous Symbols",
- /* 47 */ "Dingbats",
- /* 48 */ "CJK Symbols And Punctuation",
- /* 49 */ "Hiragana",
- /* 50 */ "Katakana",
- /* 51 */ "Bopomofo",
- /* 52 */ "Hangul Compatibility Jamo",
- /* 53 */ "CJK Miscellaneous",
- /* 54 */ "Enclosed CJK Letters And Months",
- /* 55 */ "CJK Compatibility",
- /* 56 */ "Hangul",
- /* 57 */ "Reserved for Unicode SubRanges",
- /* 58 */ "Reserved for Unicode SubRanges",
- /* 59 */ "CJK Unified Ideographs",
- /* 60 */ "Private Use Area",
- /* 61 */ "CJK Compatibility Ideographs",
- /* 62 */ "Alphabetic Presentation Forms",
- /* 63 */ "Arabic Presentation Forms-A",
- /* 64 */ "Combining Half Marks",
- /* 65 */ "CJK Compatibility Forms",
- /* 66 */ "Small Form Variants",
- /* 67 */ "Arabic Presentation Forms-B",
- /* 68 */ "Halfwidth And Fullwidth Forms",
- /* 69 */ "Specials",
- /*70-127*/ "Reserved for Unicode SubRanges"
-};
-
-
-
/*- inline functions */
#ifdef __GNUC__
#define _inline static __inline__
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
