diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-21 09:05:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-21 21:35:33 +0200 |
| commit | 99fc650d519f78e3866ce119c7d3640a070e88c5 (patch) | |
| tree | 2fd46f0df91e02b5a41e83ad60c0917608330aff /vcl | |
| parent | 05e14fdeeebe1b5bb35c847ceafc80fe9bdef16a (diff) | |
pass GetFontFace at call site
Change-Id: Id2677cdc386e51ae1549c548c06d095ad0f43b40
Reviewed-on: https://gerrit.libreoffice.org/59385
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/gdi/salfont.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index c4970b0ce9b4..a51a06a0d4c4 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -765,9 +765,6 @@ void ImplGetLogFontFromFontSelect( HDC hDC, LOGFONTW& rLogFont ) { OUString aName; - if (!pFontFace && pFont->mpFontInstance) - pFontFace = pFont->mpFontInstance->GetFontFace(); - if (pFontFace) aName = pFontFace->GetFamilyName(); else @@ -942,7 +939,7 @@ void WinSalGraphics::SetFont(LogicalFontInstance* pFont, int nFallbackLevel) mpWinFontEntry[ nFallbackLevel ] = reinterpret_cast<WinFontInstance*>(pFont); HFONT hOldFont = nullptr; - HFONT hNewFont = ImplDoSetFont(pFont->GetFontSelectPattern(), nullptr, mfFontScale[ nFallbackLevel ], hOldFont); + HFONT hNewFont = ImplDoSetFont(pFont->GetFontSelectPattern(), pFont->GetFontFace(), mfFontScale[ nFallbackLevel ], hOldFont); mfCurrentFontScale = mfFontScale[nFallbackLevel]; if( !mhDefFont ) |