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

[Tor Lillqvist]

 vcl/win/gdi/salfont.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 64e24d9bfc02910b80d77b83dcf3346eff546f96
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu May 12 17:58:04 2016 +0300

    Revert "tdf#98983: Font fallback: Map 'MS Sans Serif' to the TrueType version"
    
    Turns out the problem has already been fixed in master in a different
    way by mst. Sorry, I did not have a master build to check in Windows,
    I was actually working on fixing the bug in a 5.1 tree.
    
    This reverts commit 0a986598cf64fc386d267693a78047c2dd71a61a.

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 62d3e61..d198dc6 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1375,11 +1375,7 @@ HFONT WinSalGraphics::ImplDoSetFont( FontSelectPattern* i_pFont, float& o_rFontS
     && !bImplSalCourierScalable
     && bImplSalCourierNew
     && (ImplSalWICompareAscii( aLogFont.lfFaceName, "Courier" ) == 0) )
-        wcscpy( aLogFont.lfFaceName, L"Courier New" );
-
-    // Prefer the scalable 'Microsoft Sans Serif' to the old raster 'MS Sans Serif'
-    if( ImplSalWICompareAscii( aLogFont.lfFaceName, "MS Sans Serif" ) == 0 )
-        wcscpy( aLogFont.lfFaceName, L"Microsoft Sans Serif" );
+        lstrcpynW( aLogFont.lfFaceName, L"Courier New", 12 );
 
     // #i47675# limit font requests to MAXFONTHEIGHT
     // TODO: share MAXFONTHEIGHT font instance