diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-10-06 18:16:16 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-10-13 09:19:04 +0000 |
| commit | f6d61562d41b8a49449d881da66a3d8fa519487f (patch) | |
| tree | 15571322cf3bf8475fe2e1c5d1d0ae9fd38f7c1d /cui | |
| parent | bb1d4f8c9a275a20e8795ee36ca3259376746e4f (diff) | |
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 <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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? |