diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-05-12 17:58:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-05-12 17:58:04 +0300 |
| commit | 64e24d9bfc02910b80d77b83dcf3346eff546f96 (patch) | |
| tree | 6215130e8c632a4d7bf4c82c5e6c0edc68a39cc7 | |
| parent | 0a986598cf64fc386d267693a78047c2dd71a61a (diff) | |
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.
| -rw-r--r-- | vcl/win/gdi/salfont.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index 62d3e611eead..d198dc678319 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 |