[Libreoffice-commits] core.git: officecfg/registry unotools/source

[Takeshi Abe]

 officecfg/registry/data/org/openoffice/VCL.xcu |    2 -
 unotools/source/config/fontcfg.cxx             |   28 -------------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

New commits:
commit bba299d8146a07af6833620784ac5b697b0f7e84
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Sat Mar 3 09:24:55 2018 +0900

    tdf#114751 Update the default UI fonts for Japanese locale
    
    - give priority to IPA P Gothic and Noto Sans CJK JP
    - for Windows, try Yu Gothic UI first, then Meiryo UI
    - look for Hiragino Kaku Gothic ProN/Pro on macOS
    
    Thanks to Jun Nogata and AWASHIRO Ikuya for their suggestions.
    This addresses only part of the issue; another incoming change
    will take care of the rest.
    
    Change-Id: I1491ba63e1447d3b9086dfcfdf3981bee6282661
    Reviewed-on: https://gerrit.libreoffice.org/50515
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index 91526d120ee2..44af4ffdc891 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -238,7 +238,7 @@
         <value>HG ゴシックB Sun;HG-GothicB Sun;HG ゴシックB;HG Mincho Light J;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ Pro;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;東風ゴシック;さざなみゴシック;Kochi Gothic;UmePlus Gothic;Gothic</value>
       </prop>
       <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-        <value>HG PゴシックB Sun;Osaka;ヒラギノ角ゴ ProN;ヒラギノ角ゴ Pro;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;HG-GothicB;UmePlus P Gothic;HG Mincho Light J;標準;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;東風ゴシック;さざなみゴシック;Kochi Gothic;Gothic;Gnu-Unifont</value>
+        <value>IPA Pゴシック;IPA P Gothic;Noto Sans CJK JP;Yu Gothic UI;Meiryo UI;ヒラギノ角ゴ ProN;Hiragino Kaku Gothic ProN;ヒラギノ角ゴ Pro;Hiragino Kaku Gothic Pro</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
         <value>hgmincholightj;cumberlandamt;cumberland;couriernew;nimbusmonol;courier;lucidasanstypewriter;lucidatypewriter;monaco;monospaced</value>
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 0ffc882342e7..be09dc493eec 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -247,8 +247,6 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const LanguageTag& rLan
     #define FALLBACKFONT_UI_SANS_ARABIC "Tahoma;Traditional Arabic;Simplified Arabic;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;clearlyU;Interface User;Arial Unicode MS;Lucida Sans Unicode;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif"
     #define FALLBACKFONT_UI_SANS_THAI "OONaksit;Tahoma;Lucidasans;Arial Unicode MS"
     #define FALLBACKFONT_UI_SANS_KOREAN "SunGulim;BaekmukGulim;Gulim;Roundgothic;Arial Unicode MS;Lucida Sans Unicode;gnu-unifont;Andale Sans UI"
-    #define FALLBACKFONT_UI_SANS_JAPANESE1 "HG-GothicB-Sun;Andale Sans UI;HG MhinchoLightJ"
-    #define FALLBACKFONT_UI_SANS_JAPANESE2 "Kochi Gothic;Gothic"
     #define FALLBACKFONT_UI_SANS_CHINSIM "Andale Sans UI;Arial Unicode MS;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Lucida Sans Unicode;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;"
     #define FALLBACKFONT_UI_SANS_CHINTRD "Andale Sans UI;Arial Unicode MS;AR PL Mingti2L Big5;AR PL KaitiM Big5;Kai;PMingLiU;MingLiU;Ming;Lucida Sans Unicode;gnu-unifont;Interface User;"
 
@@ -290,32 +288,6 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const LanguageTag& rLan
     {
         return OUString(FALLBACKFONT_UI_SANS_LATIN2);
     }
-    else if ( aLanguage == "ja" )
-    {
-        // we need localized names for japanese fonts
-        const sal_Unicode aMSGothic[] = { 0xFF2D, 0xFF33, ' ', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
-        const sal_Unicode aMSPGothic[] = { 0xFF2D, 0xFF33, ' ', 0xFF30, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
-        const sal_Unicode aTLPGothic[] = { 0x0054, 0x004C, 0x0050, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
-        const sal_Unicode aLXGothic[] = { 0x004C, 0x0058, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
-        const sal_Unicode aKochiGothic[] = { 0x6771, 0x98A8, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
-
-        OUStringBuffer aFallBackJapaneseLocalized;
-        aFallBackJapaneseLocalized.append("MS UI Gothic;");
-        aFallBackJapaneseLocalized.append(FALLBACKFONT_UI_SANS_JAPANESE1);
-        aFallBackJapaneseLocalized.append(aMSPGothic);
-        aFallBackJapaneseLocalized.append(';');
-        aFallBackJapaneseLocalized.append(aMSGothic);
-        aFallBackJapaneseLocalized.append(';');
-        aFallBackJapaneseLocalized.append(aTLPGothic);
-        aFallBackJapaneseLocalized.append(';');
-        aFallBackJapaneseLocalized.append(aLXGothic);
-        aFallBackJapaneseLocalized.append(';');
-        aFallBackJapaneseLocalized.append(aKochiGothic);
-        aFallBackJapaneseLocalized.append(';');
-        aFallBackJapaneseLocalized.append(FALLBACKFONT_UI_SANS_JAPANESE2);
-
-        return aFallBackJapaneseLocalized.makeStringAndClear();
-    }
     else
     {
         Locale aLocale( aLanguageTag.getLocale());