diff options
Diffstat (limited to 'vcl/source/font')
| -rw-r--r-- | vcl/source/font/fontinstance.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/font/fontmetric.cxx | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/font/fontinstance.cxx b/vcl/source/font/fontinstance.cxx index 22fde5e09056..8415dd0390e3 100644 --- a/vcl/source/font/fontinstance.cxx +++ b/vcl/source/font/fontinstance.cxx @@ -82,7 +82,7 @@ namespace std LogicalFontInstance::LogicalFontInstance( const FontSelectPattern& rFontSelData ) : mpFontCache(nullptr) , maFontSelData( rFontSelData ) - , maFontMetric( rFontSelData ) + , mxFontMetric( new ImplFontMetricData( rFontSelData )) , mpConversion( nullptr ) , mnLineHeight( 0 ) , mnRefCount( 1 ) @@ -99,6 +99,7 @@ LogicalFontInstance::~LogicalFontInstance() { delete mpUnicodeFallbackList; mpFontCache = nullptr; + mxFontMetric = nullptr; } void LogicalFontInstance::AddFallbackForUnicode( sal_UCS4 cChar, FontWeight eWeight, const OUString& rFontName ) diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx index 6cd5c31fce8e..3f27d62be13f 100644 --- a/vcl/source/font/fontmetric.cxx +++ b/vcl/source/font/fontmetric.cxx @@ -66,6 +66,7 @@ using namespace ::utl; ImplFontMetricData::ImplFontMetricData( const FontSelectPattern& rFontSelData ) : FontAttributes( rFontSelData ) + , mnRefCount ( 0 ) , mnWidth ( rFontSelData.mnWidth ) , mnOrientation( (short)(rFontSelData.mnOrientation) ) , mnAscent( 0 ) |