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/quartz | |
| 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/quartz')
| -rw-r--r-- | vcl/quartz/ctfonts.cxx | 4 | ||||
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index a9a70e83f5d1..7e97cae775e6 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -116,7 +116,7 @@ CoreTextStyle::~CoreTextStyle() CFRelease( mpStyleDict ); } -void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const +void CoreTextStyle::GetFontMetric( ImplFontAttributes& rMetric ) const { // get the matching CoreText font handle // TODO: is it worth it to cache the CTFontRef in SetFont() and reuse it here? @@ -129,7 +129,7 @@ void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const rMetric.SetExternalLeading( lrint( CTFontGetLeading( aCTFontRef )) ); rMetric.SetInternalLeading( lrint( fAscent - fCapHeight ) ); - // since ImplFontMetricData::mnWidth is only used for stretching/squeezing fonts + // since ImplFontAttributes::mnWidth is only used for stretching/squeezing fonts // setting this width to the pixel height of the fontsize is good enough // it also makes the calculation of the stretch factor simple rMetric.SetWidth( lrint( CTFontGetSize( aCTFontRef ) * mfFontStretch) ); diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 436890af72c0..ad373cef3c84 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -305,7 +305,7 @@ void AquaSalGraphics::SetTextColor( SalColor nSalColor ) // SAL_ DEBUG(std::hex << nSalColor << std::dec << "={" << maTextColor.GetRed() << ", " << maTextColor.GetGreen() << ", " << maTextColor.GetBlue() << ", " << maTextColor.GetAlpha() << "}"); } -void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int /*nFallbackLevel*/ ) +void AquaSalGraphics::GetFontMetric( ImplFontAttributes* pMetric, int /*nFallbackLevel*/ ) { mpTextStyle->GetFontMetric( *pMetric ); } |