diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-10-04 21:55:58 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-10-06 00:13:38 +0000 |
| commit | 9177329a425cf70b515d1f266132838894fe54c6 (patch) | |
| tree | dd064e9b56019046faa0966d0147c19a7fa2ca3e /vcl/unx | |
| parent | 36e1d19af8585bc2f36322ba32acbed46e58c4de (diff) | |
vcl: FontCharMap to use intrusive_ptr ImplFontCharMap
ImplFontCharMap was using it's own reference counting mechanism,
however we can use intrusive_ptr more effectively.
Added a unit test around FontCharMap.
Change-Id: Ifab6ce002fd1df8feb7e017dea3012ff9ea7f18a
Reviewed-on: https://gerrit.libreoffice.org/11804
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/gdi/salgdi3.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 13d550ed2e61..f028597fe1da 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -431,12 +431,12 @@ void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout ) cairo_destroy(cr); } -const ImplFontCharMap* X11SalGraphics::GetImplFontCharMap() const +const ImplFontCharMapPtr X11SalGraphics::GetImplFontCharMap() const { if( !mpServerFont[0] ) return NULL; - const ImplFontCharMap* pIFCMap = mpServerFont[0]->GetImplFontCharMap(); + const ImplFontCharMapPtr pIFCMap = mpServerFont[0]->GetImplFontCharMap(); return pIFCMap; } |