[Libreoffice-commits] core.git: sc/source

[Libreoffice Gerrit user]

 sc/source/filter/excel/xistyle.cxx    |    4 ++--
 sc/source/filter/oox/stylesbuffer.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0ca822c95a21c22f5118b16a5da5761f58fa38cc
Author:     Takeshi Abe <tabe at fixedpoint.jp>
AuthorDate: Wed Jan 30 00:17:55 2019 +0900
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Tue Jan 29 18:19:22 2019 +0100

    sc: Fix CJK Unified Ideographs range in comments
    
    i.e. 4E00-9FAF -> 4E00-9FFF.
    
    According to <https://www.unicode.org/mail-arch/unicode-ml/y2003-m02/0351.html>,
    the confusion was partly due to older Unicode specification.
    As of Unicode 4.1 the trailing end (9FB0-9FFF) is in fact in use
    by "CJK Additions": <https://www.unicode.org/versions/Unicode4.1.0/>
    
    Change-Id: Ibd3704a81341743b3fa80686d3fcfc0bd11104ef
    Reviewed-on: https://gerrit.libreoffice.org/67087
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 81df8e573b24..f275a5f4ca6f 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -478,8 +478,8 @@ void XclImpFont::GuessScriptType()
                 xFontCharMap->HasChar( 0x3131 ) ||   // 3130-318F: Hangul Compatibility Jamo
                 xFontCharMap->HasChar( 0x3301 ) ||   // 3300-33FF: CJK Compatibility
                 xFontCharMap->HasChar( 0x3401 ) ||   // 3400-4DBF: CJK Unified Ideographs Extension A
-                xFontCharMap->HasChar( 0x4E01 ) ||   // 4E00-9FAF: CJK Unified Ideographs
-                xFontCharMap->HasChar( 0x7E01 ) ||   // 4E00-9FAF: CJK unified ideographs
+                xFontCharMap->HasChar( 0x4E01 ) ||   // 4E00-9FFF: CJK Unified Ideographs
+                xFontCharMap->HasChar( 0x7E01 ) ||   // 4E00-9FFF: CJK Unified Ideographs
                 xFontCharMap->HasChar( 0xA001 ) ||   // A001-A48F: Yi Syllables
                 xFontCharMap->HasChar( 0xAC01 ) ||   // AC00-D7AF: Hangul Syllables
                 xFontCharMap->HasChar( 0xCC01 ) ||   // AC00-D7AF: Hangul Syllables
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index ffc48e14532a..c87d8b27bfac 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -797,8 +797,8 @@ void Font::finalizeImport()
                     xFont->hasGlyphs( OUString( u'\x3131' ) ) ||    // 3130-318F: Hangul Compatibility Jamo
                     xFont->hasGlyphs( OUString( u'\x3301' ) ) ||    // 3300-33FF: CJK Compatibility
                     xFont->hasGlyphs( OUString( u'\x3401' ) ) ||    // 3400-4DBF: CJK Unified Ideographs Extension A
-                    xFont->hasGlyphs( OUString( u'\x4E01' ) ) ||    // 4E00-9FAF: CJK Unified Ideographs
-                    xFont->hasGlyphs( OUString( u'\x7E01' ) ) ||    // 4E00-9FAF: CJK unified ideographs
+                    xFont->hasGlyphs( OUString( u'\x4E01' ) ) ||    // 4E00-9FFF: CJK Unified Ideographs
+                    xFont->hasGlyphs( OUString( u'\x7E01' ) ) ||    // 4E00-9FFF: CJK Unified Ideographs
                     xFont->hasGlyphs( OUString( u'\xA001' ) ) ||    // A001-A48F: Yi Syllables
                     xFont->hasGlyphs( OUString( u'\xAC01' ) ) ||    // AC00-D7AF: Hangul Syllables
                     xFont->hasGlyphs( OUString( u'\xCC01' ) ) ||    // AC00-D7AF: Hangul Syllables