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/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/generic')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 7dea18bbf735..093f06d4d393 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -608,7 +608,7 @@ ServerFont::~ServerFont() } -void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const +void ServerFont::FetchFontMetric( ImplFontAttributes& rTo, long& rFactor ) const { static_cast<ImplFontAttributes&>(rTo) = mpFontInfo->GetFontAttributes(); diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 9af2857ae6f8..f8eb7ed11782 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -911,7 +911,7 @@ void GenPspGraphics::ClearDevFontCache() GlyphCache::GetInstance().ClearFontCache(); } -void GenPspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int ) +void GenPspGraphics::GetFontMetric( ImplFontAttributes *pMetric, int ) { const psp::PrintFontManager& rMgr = psp::PrintFontManager::get(); psp::PrintFontInfo aInfo; |