diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-15 03:06:18 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-14 18:09:47 +0000 |
| commit | 659db7d705835b8676065fb4fe3babe39d938977 (patch) | |
| tree | f426e3f089449a855f51ac589865212eaef241ba /vcl/source/font | |
| parent | c5c47412d16b5bbdc79886ae9bf93d0158405d14 (diff) | |
vcl: change ImplFontMetricData to be reference counted via intrusive_ptr
Change-Id: Ie9f5fbd21a6223520cbea3af6436beb407d7a88c
Reviewed-on: https://gerrit.libreoffice.org/21477
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
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 ) |