diff options
| -rw-r--r-- | vcl/inc/impfontmetricdata.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/font/fontmetric.cxx | 17 |
2 files changed, 6 insertions, 15 deletions
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx index 28e0ab3798a2..f11b763be126 100644 --- a/vcl/inc/impfontmetricdata.hxx +++ b/vcl/inc/impfontmetricdata.hxx @@ -31,12 +31,12 @@ class ImplFontMetricData; typedef tools::SvRef<ImplFontMetricData> ImplFontMetricDataRef; class OutputDevice; -class FontSelectPattern; +class FontSelectPatternAttributes; class VCL_DLLPUBLIC ImplFontMetricData : public FontAttributes, public SvRefBase { public: - explicit ImplFontMetricData( const FontSelectPattern& ); + explicit ImplFontMetricData( const FontSelectPatternAttributes& ); // font instance attributes from the font request long GetWidth() const { return mnWidth; } diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx index e6b507b161a6..d2d6e3a5d210 100644 --- a/vcl/source/font/fontmetric.cxx +++ b/vcl/source/font/fontmetric.cxx @@ -191,7 +191,7 @@ bool ImplFontMetric::operator==( const ImplFontMetric& r ) const return true; } -ImplFontMetricData::ImplFontMetricData( const FontSelectPattern& rFontSelData ) +ImplFontMetricData::ImplFontMetricData( const FontSelectPatternAttributes& rFontSelData ) : FontAttributes( rFontSelData ) , mnHeight ( rFontSelData.mnHeight ) , mnWidth ( rFontSelData.mnWidth ) @@ -231,20 +231,11 @@ ImplFontMetricData::ImplFontMetricData( const FontSelectPattern& rFontSelData ) , mnDStrikeoutOffset2( 0 ) { // initialize the used font name - if (rFontSelData.mpFontInstance) - { - SetFamilyName(rFontSelData.mpFontInstance->GetFontFace()->GetFamilyName()); - SetStyleName(rFontSelData.mpFontInstance->GetFontFace()->GetStyleName()); - } - else - { - sal_Int32 nTokenPos = 0; - SetFamilyName( GetNextFontToken( rFontSelData.GetFamilyName(), nTokenPos ) ); - SetStyleName( rFontSelData.GetStyleName() ); - } + sal_Int32 nTokenPos = 0; + SetFamilyName( GetNextFontToken( rFontSelData.GetFamilyName(), nTokenPos ) ); + SetStyleName( rFontSelData.GetStyleName() ); } - void ImplFontMetricData::ImplInitTextLineSize( const OutputDevice* pDev ) { long nDescent = mnDescent; |