diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-12-26 15:14:31 +0000 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2018-05-08 00:55:27 +0200 |
| commit | bdccb7e9991d83029eb2f2f11327b54534a00db8 (patch) | |
| tree | c32e95c49849647dc72c1071f375f3d2b67d8d7a /vcl/win/window | |
| parent | 9615e45d2e2bac79c252a018846e4f20012cfa34 (diff) | |
Refactor CommonSalLayout font handling
Moves all platform specific code from CommonSalLayout into the
platform specific plugins. This way the vcl library won't depend
on the Qt5 libraries and the Qt5Font header can be moved into the
qt5 VCL plugin.
While at it, switch the CommonSalLayouts font reference from the
FontSelectPattern to the LogicalFontInstance and also add the
harfbuzz font handling to the instance.
Change-Id: Ida910b8d88837ea949a2f84394ccc0cfae153060
Reviewed-on: https://gerrit.libreoffice.org/47408
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/win/window')
| -rw-r--r-- | vcl/win/window/salframe.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index ed65a8698d70..633e97c6670e 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -2184,7 +2184,7 @@ static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pCont // specified by this font name; but it seems to decide whether // to use that font's horizontal or vertical variant based on a // '@' in front of this font name. - ImplGetLogFontFromFontSelect(hDC, pContext->mpFont, + ImplGetLogFontFromFontSelect(hDC, &pContext->mpFont->GetFontSelectPattern(), nullptr, aLogFont); ReleaseDC( pFrame->mhWnd, hDC ); ImmSetCompositionFontW( hIMC, &aLogFont ); |