From f6d61562d41b8a49449d881da66a3d8fa519487f Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Mon, 6 Oct 2014 18:16:16 +1100 Subject: vcl: Make ImplFontCharMap a pImpl and move functions to FontCharMap To do this, I've made FontCharMap a friend class for ImplFontCharMap, and have moved the functions directly into FontCharMap. In this patch, I am attempting to stop the direct use of ImplFontCharMap by anything other than FontCharMap. However, FontCharMap itself requires a refcounter, so we will use FontCharMapPtr to access the font character map. Change-Id: I509b990a8cbd911c5cc1572c7d24fc5348ca06d9 Reviewed-on: https://gerrit.libreoffice.org/11823 Reviewed-by: Chris Sherlock Tested-by: Chris Sherlock --- cui/source/dialogs/cuicharmap.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cui') diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 2d46a7947890..94898e692528 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -446,9 +446,9 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl) bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL); if( bNeedSubset ) { - FontCharMap aFontCharMap; - m_pShowSet->GetFontCharMap( aFontCharMap ); - pSubsetMap = new SubsetMap( &aFontCharMap ); + FontCharMapPtr pFontCharMap( new FontCharMap() ); + m_pShowSet->GetFontCharMap( pFontCharMap ); + pSubsetMap = new SubsetMap( pFontCharMap ); // update subset listbox for new font's unicode subsets // TODO: is it worth to improve the stupid linear search? -- cgit v1.2.3