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/unx/generic/gdi/cairotextrender.cxx | |
| parent | it's unnecessary to buffer the string to create a string from it again (diff) | |
| download | core-659db7d705835b8676065fb4fe3babe39d938977.tar.gz core-659db7d705835b8676065fb4fe3babe39d938977.zip | |
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/unx/generic/gdi/cairotextrender.cxx')
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 4476a448da39..979202fccf57 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -455,7 +455,7 @@ FontConfigFontOptions* GetFCFontOptions( const FontAttributes& rFontAttributes, } void -CairoTextRender::GetFontMetric( ImplFontMetricData *pFontMetric, int nFallbackLevel ) +CairoTextRender::GetFontMetric( ImplFontMetricDataPtr& xFontMetric, int nFallbackLevel ) { if( nFallbackLevel >= MAX_FALLBACK ) return; @@ -463,7 +463,7 @@ CairoTextRender::GetFontMetric( ImplFontMetricData *pFontMetric, int nFallbackLe if( mpServerFont[nFallbackLevel] != nullptr ) { long rDummyFactor; - mpServerFont[nFallbackLevel]->GetFontMetric( *pFontMetric, rDummyFactor ); + mpServerFont[nFallbackLevel]->GetFontMetric( xFontMetric, rDummyFactor ); } } |