Fix Korea's Hanja Upper Numbers codepoint array #tdf130077

fix code point for Korean Numenic strings codepoint array
5 伍
1000 阡

Change-Id: Id6b37fbaf5ca538ae61555d8c2237c66406c4fb9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87240
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>

2 files changed, 19 insertions, 15 deletions

diff --git a/i18npool/source/nativenumber/data/numberchar.h b/i18npool/source/nativenumber/data/numberchar.h
index 91cd3dcae828..c36d7cff96f0 100644
--- a/i18npool/source/nativenumber/data/numberchar.h
+++ b/i18npool/source/nativenumber/data/numberchar.h
@@ -66,7 +66,7 @@ static const sal_Unicode NumberChar[][10] = {
     { 0x3007, 0x4E00, 0x4E8C, 0x4E09, 0x56DB, 0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Japanese Modern
     { 0x96F6, 0x58F1, 0x5F10, 0x53C2, 0x56DB, 0x4F0D, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Japanese Trad.
     { 0x3007, 0x4E00, 0x4E8C, 0x4E09, 0x56DB, 0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Korean Lower
-    { 0xF9B2, 0x58F9, 0x8CB3, 0x53C3, 0x56DB, 0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Korean Upper
+    { 0xF9B2, 0x58F9, 0x8CB3, 0x53C3, 0x56DB, 0x4F0D, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Korean Upper
     { 0xC601, 0xC77C, 0xC774, 0xC0BC, 0xC0AC, 0xC624, 0xC721, 0xCE60, 0xD314, 0xAD6C }, // Korean Hangul
     { 0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, 0x0668, 0x0669 }, // Arabic Indic
     { 0x06F0, 0x06F1, 0x06F2, 0x06F3, 0x06F4, 0x06F5, 0x06F6, 0x06F7, 0x06F8, 0x06F9 }, // Est. Arabic Indic
@@ -136,8 +136,8 @@ static const sal_Unicode MinusChar[] = {
     0x2212, // Japanese Modern
     0x2212, // Japanese Trad.
     0xFF0D, // Korean Lower
-    0x5069, // Korean Upper
-    0xFF0D, // Korean Hangul ???
+    0xFF0D, // Korean Upper
+    0xFF0D, // Korean Hangul
     0x0000, // Arabic Indic
     0x2212, // Est. Arabic Indic
     0x0000, // Indic
@@ -170,9 +170,9 @@ static sal_uInt16 SeparatorChar[] = {
     0x3001, // T. Chinese Upper
     0x3001, // Japanese Modern
     0x3001, // Japanese Trad.
-    0x3001, // Korean Lower
-    0x3001, // Korean Upper
-    0x3001, // Korean Hangul
+    0x002C, // Korean Lower
+    0x002C, // Korean Upper
+    0x002C, // Korean Hangul
     0x0000, // Arabic Indic
     0x066C, // Est. Arabic Indic
     0x0000, // Indic
@@ -210,10 +210,11 @@ const sal_Int16 Multiplier_Upper_zh     = 1;
 const sal_Int16 Multiplier_Lower_zh_TW  = 2;
 const sal_Int16 Multiplier_Upper_zh_TW  = 3;
 const sal_Int16 Multiplier_Lower_ko     = 4;
-const sal_Int16 Multiplier_Hangul_ko    = 5;
-const sal_Int16 Multiplier_Modern_ja    = 6;
-const sal_Int16 Multiplier_Traditional_ja = 7;
-const sal_Int16 Multiplier_Count    = 8;
+const sal_Int16 Multiplier_Upper_ko     = 5;
+const sal_Int16 Multiplier_Hangul_ko    = 6;
+const sal_Int16 Multiplier_Modern_ja    = 7;
+const sal_Int16 Multiplier_Traditional_ja = 8;
+const sal_Int16 Multiplier_Count    = 9;
 
 const sal_Int16 ExponentCount_6_CJK     = 6;
 
@@ -224,8 +225,9 @@ static const sal_Unicode MultiplierChar_6_CJK[][ExponentCount_6_CJK] = {
     {0x5146, 0x4EBF, 0x4E07, 0x5343, 0x767E, 0x5341},   // S. Chinese Lower
     {0x5146, 0x4EBF, 0x4E07, 0x4EDF, 0x4F70, 0x62FE},   // S. Chinese Upper
     {0x5146, 0x5104, 0x842C, 0x5343, 0x767E, 0x5341},   // T. Chinese Lower
-    {0x5146, 0x5104, 0x842C, 0x4EDF, 0x4F70, 0x62FE},   // T. Chinese & Korean Upper
+    {0x5146, 0x5104, 0x842C, 0x4EDF, 0x4F70, 0x62FE},   // T. Chinese Upper
     {0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},   // Korean Lower
+    {0x5146, 0x5104, 0x842C, 0x9621, 0x4F70, 0x62FE},   // Korean Upper
     {0xC870, 0xC5B5, 0xB9CC, 0xCC9C, 0xBC31, 0xC2ED},   // Korean Hangul
     {0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},   // Japanese Modern
     {0x5146, 0x5104, 0x842C, 0x9621, 0x767E, 0x62FE}    // Japanese Traditional
@@ -241,8 +243,9 @@ static const sal_Unicode MultiplierChar_2_CJK[][ExponentCount_2_CJK] = {
     {0x4EBF, 0x4E07}, // S. Chinese Lower
     {0x4EBF, 0x4E07}, // S. Chinese Upper
     {0x5104, 0x842C}, // T. Chinese Lower
-    {0x5104, 0x842C}, // T. Chinese & Korean Upper
+    {0x5104, 0x842C}, // T. Chinese Upper
     {0x5104, 0x4E07}, // Korean Lower
+    {0x5104, 0x842C}, // Korean Upper
     {0xC5B5, 0xB9CC}, // Korean Hangul
     {0x5104, 0x4E07}, // Japanese Modern
     {0x5104, 0x842C}  // Japanese Traditional
@@ -257,8 +260,9 @@ static const sal_Unicode MultiplierChar_7_CJK[][ExponentCount_7_CJK] = {
     {0x4EAC, 0x5146, 0x4EBF, 0x4E07, 0x5343, 0x767E, 0x5341},   // S. Chinese Lower
     {0x4EAC, 0x5146, 0x4EBF, 0x4E07, 0x4EDF, 0x4F70, 0x62FE},   // S. Chinese Upper
     {0x4EAC, 0x5146, 0x5104, 0x842C, 0x5343, 0x767E, 0x5341},   // T. Chinese Lower
-    {0x4EAC, 0x5146, 0x5104, 0x842C, 0x4EDF, 0x4F70, 0x62FE},   // T. Chinese & Korean Upper
+    {0x4EAC, 0x5146, 0x5104, 0x842C, 0x4EDF, 0x4F70, 0x62FE},   // T. Chinese Upper
     {0x4EAC, 0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},   // Korean Lower
+    {0x4EAC, 0x5146, 0x5104, 0x842C, 0x9621, 0x4F70, 0x62FE},   // Korean Upper
     {0x4EAC, 0xC870, 0xC5B5, 0xB9CC, 0xCC9C, 0xBC31, 0xC2ED},   // Korean Hangul
     {0x4EAC, 0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},   // Japanese Modern
     {0x4EAC, 0x5146, 0x5104, 0x842C, 0x9621, 0x767E, 0x62FE}    // Japanese Traditional
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index ec986bcf9dcc..ff521145045e 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -409,7 +409,7 @@ const Number natnum5[4] = {
                 ExponentCount_6_CJK, MultiplierExponent_6_CJK },
         { NumberChar_Traditional_ja, MultiplierChar_7_CJK[Multiplier_Traditional_ja], NUMBER_OMIT_ZERO_ONE_67,
                 ExponentCount_7_CJK, MultiplierExponent_7_CJK },
-        { NumberChar_Upper_ko, MultiplierChar_6_CJK[Multiplier_Upper_zh_TW], NUMBER_OMIT_ZERO,
+        { NumberChar_Upper_ko, MultiplierChar_6_CJK[Multiplier_Upper_ko], 0,
                 ExponentCount_6_CJK, MultiplierExponent_6_CJK },
 };
 
@@ -442,7 +442,7 @@ const Number natnum8[4] = {
                 ExponentCount_6_CJK, MultiplierExponent_6_CJK },
         { NumberChar_Traditional_ja, MultiplierChar_2_CJK[Multiplier_Traditional_ja], NUMBER_OMIT_ZERO_ONE,
                 ExponentCount_2_CJK, MultiplierExponent_2_CJK },
-        { NumberChar_Upper_ko, MultiplierChar_6_CJK[Multiplier_Upper_zh_TW], NUMBER_OMIT_ALL,
+        { NumberChar_Upper_ko, MultiplierChar_6_CJK[Multiplier_Upper_ko], NUMBER_OMIT_ALL,
                 ExponentCount_6_CJK, MultiplierExponent_6_CJK },
 };