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/inc/unx/salgdi.h | |
| 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/inc/unx/salgdi.h')
| -rw-r--r-- | vcl/inc/unx/salgdi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 5bca1ae938c7..057d1953caab 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -43,7 +43,7 @@ typedef unsigned long Pixel; class FontAttributes; -class FontSelectPattern; +class FontSelectPatternAttributes; class SalBitmap; class SalColormap; class SalDisplay; @@ -115,7 +115,7 @@ public: virtual void SetROPFillColor( SalROPColor nROPColor ) override; virtual void SetTextColor( Color nColor ) override; - virtual void SetFont( LogicalFontInstance*, int nFallbackLevel ) override; + virtual void SetFont(LogicalFontInstance*, int nFallbackLevel) override; virtual void GetFontMetric( ImplFontMetricDataRef&, int nFallbackLevel ) override; virtual const FontCharMapRef GetFontCharMap() const override; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; |