summaryrefslogtreecommitdiff
path: root/vcl/headless
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-10-04 21:55:58 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2014-10-06 00:13:38 +0000
commit9177329a425cf70b515d1f266132838894fe54c6 (patch)
treedd064e9b56019046faa0966d0147c19a7fa2ca3e /vcl/headless
parent36e1d19af8585bc2f36322ba32acbed46e58c4de (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/headless')
-rw-r--r--vcl/headless/svptext.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 3f2384c5da17..905d78bef9fd 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -231,12 +231,12 @@ void SvpSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe
}
}
-const ImplFontCharMap* SvpSalGraphics::GetImplFontCharMap() const
+const ImplFontCharMapPtr SvpSalGraphics::GetImplFontCharMap() const
{
if( !m_pServerFont[0] )
return NULL;
- const ImplFontCharMap* pIFCMap = m_pServerFont[0]->GetImplFontCharMap();
+ const ImplFontCharMapPtr pIFCMap = m_pServerFont[0]->GetImplFontCharMap();
return pIFCMap;
}