summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-01 17:26:44 +0000
committerAndras Timar <andras.timar@collabora.com>2017-04-23 17:44:47 +0200
commitb25979ea1455d6703abb0e988d389b2c8210d986 (patch)
treed29540236bf275ac40f9d9197194f1b814e0cb24 /sal
parentbd99573a0c01b05baa66631cf36ab3acf75d1041 (diff)
ofz#358 SJIS_84 table mnLeadEnd is out by one
sjis 82 and 83 correctly denote the last index available while 84 reports one past the last available index 0x84BE is the last value to map, not 0x84BF Change-Id: Idcadc2d554ee59586f6e2f2775301fe69c94d55a (cherry picked from commit 0f4eb22d5f3a86af9e5f8042c69e4ddf4a350b93) Reviewed-on: https://gerrit.libreoffice.org/32589 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit fa2d2973ed860b682aa4a42e1c04b16215813fac) (cherry picked from commit 7f6d24c2f7f9dce4a21c80eb1294e60ccc787958)
Diffstat (limited to 'sal')
-rw-r--r--sal/textenc/tcvtjp6.tab6
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/textenc/tcvtjp6.tab b/sal/textenc/tcvtjp6.tab
index a5b1d1b792a0..e1267b2f03a8 100644
--- a/sal/textenc/tcvtjp6.tab
+++ b/sal/textenc/tcvtjp6.tab
@@ -162,7 +162,7 @@ static ImplDBCSToUniLeadTab const aSJISUniLeadTab[256] =
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_81 }, /* 0x81 */
{ 0, 0x4F, 0xF1, aImplDBCSToUniTab_SJIS_82 }, /* 0x82 */
{ 0, 0x40, 0xD6, aImplDBCSToUniTab_SJIS_83 }, /* 0x83 */
- { 0, 0x40, 0xBF, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */
+ { 0, 0x40, 0xBE, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */
{ 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x85 */ /* We convert this as double byte */
{ 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x86 */ /* We convert this as double byte */
{ 0, 0x40, 0x9C, aImplDBCSToUniTab_MS932_87 }, /* 0x87 */ /* We use the MS table for better MS compatibility */
@@ -734,7 +734,7 @@ static ImplDBCSToUniLeadTab const aMS932UniLeadTab[256] =
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_81 }, /* 0x81 */
{ 0, 0x4F, 0xF1, aImplDBCSToUniTab_SJIS_82 }, /* 0x82 */
{ 0, 0x40, 0xD6, aImplDBCSToUniTab_SJIS_83 }, /* 0x83 */
- { 0, 0x40, 0xBF, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */
+ { 0, 0x40, 0xBE, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */
{ 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x85 */ /* We convert this as double byte */
{ 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x86 */ /* We convert this as double byte */
{ 0, 0x40, 0x9C, aImplDBCSToUniTab_MS932_87 }, /* 0x87 */
@@ -1291,7 +1291,7 @@ static ImplDBCSToUniLeadTab const aAPPLEJAPANESEUniLeadTab[256] =
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_81 }, /* 0x81 */
{ 0, 0x4F, 0xF1, aImplDBCSToUniTab_SJIS_82 }, /* 0x82 */
{ 0, 0x40, 0xD6, aImplDBCSToUniTab_SJIS_83 }, /* 0x83 */
- { 0, 0x40, 0xBF, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */
+ { 0, 0x40, 0xBE, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */
{ 0, 0x40, 0xF4, aImplDBCSToUniTab_APPLEJAPANESE_85 }, /* 0x85 */
{ 0, 0x40, 0xD2, aImplDBCSToUniTab_APPLEJAPANESE_86 }, /* 0x86 */
{ 0, 0x40, 0xFA, aImplDBCSToUniTab_APPLEJAPANESE_87 }, /* 0x87 */