[Libreoffice-commits] core.git: vcl/win

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Oct 21 10:51:44 UTC 2019


 vcl/win/window/salframe.cxx |   12 ------------
 1 file changed, 12 deletions(-)

New commits:
commit 06be436363f1b9d72a19aba7c1e6df3fcf6c7844
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 21 11:09:06 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Oct 21 12:50:36 2019 +0200

    ditch archaic Russian-only ui font tweak
    
    Change-Id: Ib45ea8cebe5f4069e05353bc5f1be6b67045a18c
    Reviewed-on: https://gerrit.libreoffice.org/81216
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index bb6a6fed2e44..efb9f2a5c301 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2724,18 +2724,6 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetFloatTitleFont( aFloatTitleFont );
     aStyleSettings.SetHelpFont( aHelpFont );
     aStyleSettings.SetIconFont( aIconFont );
-    // We prefer Arial in the russian version, because MS Sans Serif
-    // is too wide for the dialogs
-    if ( rSettings.GetLanguageTag().getLanguageType() == LANGUAGE_RUSSIAN )
-    {
-        OUString aFontName = aAppFont.GetFamilyName();
-        OUString aFirstName = aFontName.getToken( 0, ';' );
-        if ( aFirstName.equalsIgnoreAsciiCase( "MS Sans Serif" ) )
-        {
-            aFontName = "Arial;" + aFontName;
-            aAppFont.SetFamilyName( aFontName );
-        }
-    }
 
     if ( aAppFont.GetWeight() > WEIGHT_NORMAL )
         aAppFont.SetWeight( WEIGHT_NORMAL );


More information about the Libreoffice-commits mailing list