diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-12 14:47:34 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-12 05:36:04 +0000 |
| commit | b4b0cc2a5eef42434444e51fda4a13fc48183aa0 (patch) | |
| tree | 1061efa135f480b37c90879d7c049872d0e738eb /vcl/inc/textrender.hxx | |
| parent | 414c5c5aee8692614e4e5a5f97d11bea157bcaef (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/inc/textrender.hxx')
| -rw-r--r-- | vcl/inc/textrender.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx index 11a38cbae896..2c0bf7fc9406 100644 --- a/vcl/inc/textrender.hxx +++ b/vcl/inc/textrender.hxx @@ -31,6 +31,7 @@ #include <config_cairo_canvas.h> class ImplLayoutArgs; +class ImplFontMetricData; class ServerFontLayout; class PhysicalFontCollection; class PhysicalFontFace; @@ -42,7 +43,7 @@ public: virtual void SetTextColor( SalColor nSalColor ) = 0; virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) = 0; - virtual void GetFontAttributes( FontAttributes*, int nFallbackLevel ) = 0; + virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) = 0; virtual const FontCharMapPtr GetFontCharMap() const = 0; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const = 0; virtual void GetDevFontList( PhysicalFontCollection* ) = 0; |