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/generic | |
| 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/generic')
| -rw-r--r-- | vcl/inc/generic/genpspgraphics.h | 2 | ||||
| -rw-r--r-- | vcl/inc/generic/glyphcache.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 947f2cae1066..286e84bbe14d 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -92,7 +92,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; diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 9ebe7f7ccfe0..9ead91b0ade3 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -160,7 +160,7 @@ public: const FontSelectPattern& GetFontSelData() const { return maFontSelData; } - void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const; + void FetchFontMetric( ImplFontAttributes&, long& rFactor ) const; const unsigned char* GetTable( const char* pName, sal_uLong* pLength ); int GetEmUnits() const { return maFaceFT->units_per_EM;} double GetStretch() { return mfStretch; } |