[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sal/textenc

[Caolán McNamara]

 sal/textenc/tcvtjp6.tab |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fa2d2973ed860b682aa4a42e1c04b16215813fac
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 1 17:26:44 2017 +0000

    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 at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sal/textenc/tcvtjp6.tab b/sal/textenc/tcvtjp6.tab
index 3b98079..1dd7789 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 */