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/win | |
| 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/win')
| -rw-r--r-- | vcl/win/gdi/salgdi3.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/win/gdi/salgdi3.cxx b/vcl/win/gdi/salgdi3.cxx index 40213934b9fe..e561e281885f 100644 --- a/vcl/win/gdi/salgdi3.cxx +++ b/vcl/win/gdi/salgdi3.cxx @@ -1479,7 +1479,7 @@ sal_uInt16 WinSalGraphics::SetFont( FontSelectPattern* pFont, int nFallbackLevel return 0; } -void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLevel ) +void WinSalGraphics::GetFontMetric( ImplFontAttributes* pMetric, int nFallbackLevel ) { // temporarily change the HDC to the font in the fallback level HFONT hOldFont = SelectFont( getHDC(), mhFonts[nFallbackLevel] ); |