diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-03 15:34:45 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-03 06:14:41 +0000 |
| commit | 7b974e056df3ad023b18592bc01394943305dc41 (patch) | |
| tree | 8636d213740ec1ee2943105d65af147b8d6de2b7 /vcl/inc/unx/salgdi.h | |
| parent | 694ec8930ab7d7a54805ec598be84845b502772c (diff) | |
vcl: merge ImplFontMetricData with ImplFontAttributes
Change-Id: Ia2fe20559745e705667f23cdd73cbe50c6371aaa
Reviewed-on: https://gerrit.libreoffice.org/21053
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.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 ffe0918bb7ad..9f93d18337e2 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -36,7 +36,7 @@ #include <deque> #include <memory> -class ImplFontMetricData; +class ImplFontAttributes; class FontSelectPattern; class SalBitmap; class SalColormap; @@ -114,7 +114,7 @@ public: virtual void SetTextColor( SalColor nSalColor ) override; virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) override; - virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override; + virtual void GetFontMetric( ImplFontAttributes*, int nFallbackLevel ) override; virtual const FontCharMapPtr GetFontCharMap() const override; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; virtual void GetDevFontList( PhysicalFontCollection* ) override; |