From b4b0cc2a5eef42434444e51fda4a13fc48183aa0 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Tue, 12 Jan 2016 14:47:34 +1100 Subject: vcl: resplit FontAttributes from ImplFontMetricData The change I made in commit 7b974e056df3 ("vcl: merge ImplFontMetricData with ImplFontAttributes") was... ill-advised. For starters, there really needs to be this split as FontSelectPattern needs it, and PhysicalFontFace only requires the font attributes, not the metric data. So the merge was unfortunately, in my mind, a failure and I'm manually backing it out now. Change-Id: Iac38f0815f984541e2f55099c965376dd88eeb43 Reviewed-on: https://gerrit.libreoffice.org/21380 Tested-by: Jenkins Reviewed-by: Chris Sherlock --- vcl/inc/headless/svpgdi.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'vcl/inc/headless') diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index cb04f7b09a7d..e88701d83d77 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -29,6 +29,7 @@ #include "salgdi.hxx" #include "sallayout.hxx" #include "svpcairotextrender.hxx" +#include "impfontmetricdata.hxx" #ifdef IOS #define SvpSalGraphics AquaSalGraphics @@ -121,7 +122,7 @@ public: virtual void SetTextColor( SalColor nSalColor ) override; virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) override; - virtual void GetFontAttributes( FontAttributes*, int nFallbackLevel ) override; + virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override; virtual const FontCharMapPtr GetFontCharMap() const override; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; virtual void GetDevFontList( PhysicalFontCollection* ) override; -- cgit v1.2.3