diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-21 08:38:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-22 00:24:15 +0200 |
| commit | b10c8f3fce37d72019f4767fdb9612b46845aecd (patch) | |
| tree | b6a74975522b301cb9892021a32135ee75bf7a2d /vcl/win | |
| parent | 4790dd4d957827f9b2eeffe23ce1a8d63635df0d (diff) | |
turn the cache around to work on LogicalFontInstance
instead of a FontSelectPattern with an associated LogicalFontInstance
use a LogicalFontInstance with owned FontSelectPatternAttributes
Change-Id: I939f84731fcb8db5ff6484dcfbd2f9199bb50d23
Reviewed-on: https://gerrit.libreoffice.org/59388
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 | 2 | ||||
| -rw-r--r-- | vcl/win/gdi/winlayout.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index 010142648a5b..b7069da8e28c 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -660,7 +660,7 @@ sal_IntPtr WinFontFace::GetFontId() const return mnId; } -rtl::Reference<LogicalFontInstance> WinFontFace::CreateFontInstance(const FontSelectPattern& rFSD) const +rtl::Reference<LogicalFontInstance> WinFontFace::CreateFontInstance(const FontSelectPatternAttributes& rFSD) const { return new WinFontInstance(*this, rFSD); } diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 3411b54c8652..2fe463fbc1ef 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -311,7 +311,7 @@ std::unique_ptr<SalLayout> WinSalGraphics::GetTextLayout(ImplLayoutArgs& /*rArgs return std::unique_ptr<SalLayout>(aLayout); } -WinFontInstance::WinFontInstance(const PhysicalFontFace& rPFF, const FontSelectPattern& rFSP) +WinFontInstance::WinFontInstance(const PhysicalFontFace& rPFF, const FontSelectPatternAttributes& rFSP) : LogicalFontInstance(rPFF, rFSP) , m_hFont(nullptr) { |