diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-20 12:35:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-21 21:36:58 +0200 |
| commit | fa0ea0257676d7f96938216ac958a08d7c9a364c (patch) | |
| tree | e413f20b2facc0a04df1717e64c0b71a5c783afc /vcl/win | |
| parent | fb4a58fcaefc2f437c0ec4a7cb40281aef4162da (diff) | |
change FindFontSubstitute to operate on FontSelectPatternAttributes
it remains to be seen if we need the the returned mpFontInstance
of the coretext impl
Change-Id: I48f73188250c3eb014f16ffe0a735191da5cb25b
Reviewed-on: https://gerrit.libreoffice.org/59322
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/gdi/salfont.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index 3fe7b6171453..010142648a5b 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -149,7 +149,7 @@ class WinPreMatchFontSubstititution : public ImplPreMatchFontSubstitution { public: - bool FindFontSubstitute(FontSelectPattern&) const override; + bool FindFontSubstitute(FontSelectPatternAttributes&) const override; }; class WinGlyphFallbackSubstititution @@ -166,7 +166,7 @@ public: ReleaseDC(nullptr, mhDC); }; - bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingChars ) const override; + bool FindFontSubstitute(FontSelectPatternAttributes&, LogicalFontInstance* pLogicalFont, OUString& rMissingChars) const override; private: HDC mhDC; bool HasMissingChars(PhysicalFontFace*, OUString& rMissingChars) const; @@ -257,7 +257,7 @@ static const std::map<OUString, OUString> aBitmapFontSubs = }; // TODO: See if Windows have API that we can use here to improve font fallback. -bool WinPreMatchFontSubstititution::FindFontSubstitute(FontSelectPattern& rFontSelData) const +bool WinPreMatchFontSubstititution::FindFontSubstitute(FontSelectPatternAttributes& rFontSelData) const { if (rFontSelData.IsSymbolFont() || IsStarSymbol(rFontSelData.maSearchName)) return false; @@ -276,7 +276,7 @@ bool WinPreMatchFontSubstititution::FindFontSubstitute(FontSelectPattern& rFontS // find a fallback font for missing characters // TODO: should stylistic matches be searched and preferred? -bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, OUString& rMissingChars ) const +bool WinGlyphFallbackSubstititution::FindFontSubstitute(FontSelectPatternAttributes& rFontSelData, LogicalFontInstance* /*pLogicalFont*/, OUString& rMissingChars) const { // guess a locale matching to the missing chars LanguageType eLang = rFontSelData.meLanguage; |