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/headless/svptext.cxx | |
| 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/headless/svptext.cxx')
| -rw-r--r-- | vcl/headless/svptext.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index 4201649e00e5..4c40086484ee 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -22,15 +22,16 @@ #include <basegfx/range/b2ibox.hxx> #include "headless/svpgdi.hxx" #include <config_cairo_canvas.h> +#include "impfontmetricdata.hxx" sal_uInt16 SvpSalGraphics::SetFont( FontSelectPattern* pIFSD, int nFallbackLevel ) { return m_aTextRenderImpl.SetFont(pIFSD, nFallbackLevel); } -void SvpSalGraphics::GetFontAttributes( FontAttributes* pFontAttributes, int nFallbackLevel ) +void SvpSalGraphics::GetFontMetric( ImplFontMetricData* pFontMetric, int nFallbackLevel ) { - m_aTextRenderImpl.GetFontAttributes(pFontAttributes, nFallbackLevel); + m_aTextRenderImpl.GetFontMetric(pFontMetric, nFallbackLevel); } const FontCharMapPtr SvpSalGraphics::GetFontCharMap() const |