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 /starmath | |
| 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 'starmath')
| -rw-r--r-- | starmath/source/dialog.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 272405ba5164..2f1bf0a4bd93 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -2277,11 +2277,11 @@ void SmSymDefineDialog::SetFont(const OUString &rFontName, const OUString &rStyl pSymbolDisplay->SetFont(aFI); // update subset listbox for new font's unicode subsets - FontCharMap aFontCharMap; - pCharsetDisplay->GetFontCharMap( aFontCharMap ); + FontCharMapPtr pFontCharMap; + pCharsetDisplay->GetFontCharMap( pFontCharMap ); if (pSubsetMap) delete pSubsetMap; - pSubsetMap = new SubsetMap( &aFontCharMap ); + pSubsetMap = new SubsetMap( pFontCharMap ); pFontsSubsetLB->Clear(); bool bFirst = true; @@ -2298,6 +2298,8 @@ void SmSymDefineDialog::SetFont(const OUString &rFontName, const OUString &rStyl if( bFirst ) pFontsSubsetLB->SetNoSelection(); pFontsSubsetLB->Enable( !bFirst ); + + pFontCharMap = 0; } |