diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-07-16 16:04:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-07-16 18:22:39 +0200 |
| commit | cf6c748f30fd630b6b7256e0c7ba1783892f9d1e (patch) | |
| tree | 3ea53faf3695f76c755242b955e43eef756a43d7 /cui | |
| parent | 66537c7cecbfe92b3b50cff4c0cac051d8d4272f (diff) | |
tdf#118681 make sure we're using the right font char map
Change-Id: I64265dac5d0d18b092d64ef656997d7177a425a4
Reviewed-on: https://gerrit.libreoffice.org/57504
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 6e9299545e34..71c1360f4f7d 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -667,8 +667,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl, weld::ComboBoxText&, void) bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL); if (bNeedSubset) { - FontCharMapRef xFontCharMap( new FontCharMap() ); - m_xShowSet->GetFontCharMap( xFontCharMap ); + FontCharMapRef xFontCharMap = m_xShowSet->GetFontCharMap(); pSubsetMap.reset(new SubsetMap( xFontCharMap )); // update subset listbox for new font's unicode subsets @@ -840,8 +839,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, SearchUpdateHdl, weld::Entry&, void) toggleSearchView(true); - FontCharMapRef xFontCharMap(new FontCharMap()); - m_xSearchSet->GetFontCharMap(xFontCharMap); + FontCharMapRef xFontCharMap = m_xSearchSet->GetFontCharMap(); sal_UCS4 sChar = xFontCharMap->GetFirstChar(); while(sChar != xFontCharMap->GetLastChar()) @@ -1060,8 +1058,7 @@ void SvxCharacterMap::selectCharByCode(Radix radix) // Convert the code back to a character using the appropriate radix sal_UCS4 cChar = aCodeString.toUInt32(static_cast<sal_Int16> (radix)); // Use FontCharMap::HasChar(sal_UCS4 cChar) to see if the desired character is in the font - FontCharMapRef xFontCharMap(new FontCharMap()); - m_xShowSet->GetFontCharMap(xFontCharMap); + FontCharMapRef xFontCharMap = m_xShowSet->GetFontCharMap(); if (xFontCharMap->HasChar(cChar)) // Select the corresponding character SetChar(cChar); |