[Libreoffice-commits] core.git: sal/qa sal/textenc

[Stephan Bergmann (via logerrit)]

 sal/qa/rtl/textenc/rtl_textcvt.cxx |    6 +++---
 sal/textenc/tcvtjp2.tab            |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 27808e6e3ed049dda09f552b7769a4e87a82283a
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Sep 6 16:25:40 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Sep 11 19:25:49 2019 +0200

    Fix Unicode to Shift JIS/MS932 conversion data
    
    These are MS932 extensions, and per
    <https://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT>
    ("Table version: 2.01", "Date: 04/15/98"), U+4F92 is a mapping for 0xFA6F (and
    also for 0xED53, which is also an MS932 extension, and "loses" here), and
    U+4F9A is a mapping for 0xFA71 (and also for 0xED55, which is also an MS932
    extension, and "loses" here).  (And neither U+4F92 nor U+4F9A appear as mappings
    in <https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/SHIFTJIS.TXT>,
    "Table version: 2.0", "Date: 2011 October 14 (header updated: 2015
    December 02)".)
    
    This appears to be a typo dating back to
    9399c662f36c385b0c705eb34e636a9aec450282 "initial import".
    
    Change-Id: I0c699675355d839e62d6e4082355a2d67472533e
    Reviewed-on: https://gerrit.libreoffice.org/78720
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index 068e727d53cb..795950a0347a 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -1765,9 +1765,9 @@ void Test::testComplex() {
               RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR },
 #if WITH_LOCALE_ALL || WITH_LOCALE_ja
             { RTL_TEXTENCODING_SHIFT_JIS,
-              RTL_CONSTASCII_STRINGPARAM("\x00"),
-              {0x0000},
-              1,
+              RTL_CONSTASCII_STRINGPARAM("\x00\xFA\x6F\xFA\x71"),
+              {0x0000, 0x4F92, 0x4F9A},
+              3,
               true,
               true,
               true,
diff --git a/sal/textenc/tcvtjp2.tab b/sal/textenc/tcvtjp2.tab
index fc9b0a3d98d7..1e4716b168bf 100644
--- a/sal/textenc/tcvtjp2.tab
+++ b/sal/textenc/tcvtjp2.tab
@@ -717,8 +717,8 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_4F[] =
          0,      0,      0, 0x98CD, 0x8CF1,      0,      0, 0x8E67, /* 0x70 */
          0,      0,      0, 0x8AA4,      0,      0, 0x98D2,      0, /* 0x80 */
     0x98CA,      0, 0xFA70, 0x97E1,      0, 0x8E98,      0, 0x98CB, /* 0x80 */
-         0, 0x98D0, 0xFA71,      0, 0xFA72,      0, 0x98D3,      0, /* 0x90 */
-    0x98CC,      0, 0xFA6F, 0x8B9F,      0, 0x88CB,      0,      0, /* 0x90 */
+         0, 0x98D0, 0xFA6F,      0, 0xFA72,      0, 0x98D3,      0, /* 0x90 */
+    0x98CC,      0, 0xFA71, 0x8B9F,      0, 0x88CB,      0,      0, /* 0x90 */
     0x8BA0, 0x89BF,      0,      0,      0,      0,      0,      0, /* 0xA0 */
          0,      0,      0, 0x9B44,      0, 0x9699, 0x958E, 0x8CF2, /* 0xA0 */
          0,      0,      0,      0,      0, 0x904E, 0x97B5,      0, /* 0xB0 */