From 536d0e27f05d9db7469bd8a3571c87b2ea885367 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 10 Jan 2016 21:37:22 +1100 Subject: Cleanup FontCharMapPtr variable prefixes Change-Id: Ib106b91ab71ee45d5ad469d0beaf4ebaef8b57e1 Reviewed-on: https://gerrit.libreoffice.org/21306 Tested-by: Jenkins Reviewed-by: Chris Sherlock --- cui/source/dialogs/cuicharmap.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index ee26bca6d980..b17931ca3df5 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -455,9 +455,9 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void) bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL); if( bNeedSubset ) { - FontCharMapPtr pFontCharMap( new FontCharMap() ); - m_pShowSet->GetFontCharMap( pFontCharMap ); - pSubsetMap = new SubsetMap( pFontCharMap ); + FontCharMapPtr xFontCharMap( new FontCharMap() ); + m_pShowSet->GetFontCharMap( xFontCharMap ); + pSubsetMap = new SubsetMap( xFontCharMap ); // update subset listbox for new font's unicode subsets // TODO: is it worth to improve the stupid linear search? @@ -600,9 +600,9 @@ void SvxCharacterMap::selectCharByCode(Radix radix) // Convert the code back to a character using the appropriate radix sal_UCS4 cChar = aCodeString.toUInt32(static_cast (radix)); // Use FontCharMap::HasChar(sal_UCS4 cChar) to see if the desired character is in the font - FontCharMapPtr pFontCharMap(new FontCharMap()); - m_pShowSet->GetFontCharMap(pFontCharMap); - if (pFontCharMap->HasChar(cChar)) + FontCharMapPtr xFontCharMap(new FontCharMap()); + m_pShowSet->GetFontCharMap(xFontCharMap); + if (xFontCharMap->HasChar(cChar)) // Select the corresponding character SetChar(cChar); } -- cgit