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/quartz | |
| 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/quartz')
| -rw-r--r-- | vcl/inc/quartz/salgdi.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 03ef055d1feb..a9628459edf6 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -39,6 +39,7 @@ #include <vcl/metric.hxx> #include "fontinstance.hxx" +#include "impfontmetricdata.hxx" #include "PhysicalFontFace.hxx" #include "salgdi.hxx" @@ -94,7 +95,7 @@ public: SalLayout* GetTextLayout( void ) const; - void GetFontAttributes( FontAttributes& ) const; + void GetFontMetric( ImplFontMetricData& ) const; bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) const; bool GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) const; @@ -338,7 +339,7 @@ public: // set the font virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) override; // get the current font's metrics - virtual void GetFontAttributes( FontAttributes*, int nFallbackLevel ) override; + virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override; // get the repertoire of the current font virtual const FontCharMapPtr GetFontCharMap() const override; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; |