sal_uInt16 to sal_Int32, constify/reduce OUStrings

Change-Id: I123274309ecc4ba8d1aa605d3aadc37bb11df9a0

1 files changed, 5 insertions, 6 deletions

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 03c4be85376c..3eb37ba97f35 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1125,12 +1125,11 @@ void SfxConfigGroupListBox::SelectMacro( const SfxMacroInfoItem *pItem )
 void SfxConfigGroupListBox::SelectMacro( const OUString& rBasic,
          const OUString& rMacro )
 {
-    OUString aBasicName( rBasic );
-    aBasicName += " ";
-    aBasicName += pImp->m_sMacros;
-    OUString aLib, aModule, aMethod;
-    sal_uInt16 nCount = comphelper::string::getTokenCount(rMacro, '.');
-    aMethod = rMacro.getToken( nCount-1, '.' );
+    const OUString aBasicName( rBasic + " " + pImp->m_sMacros );
+    const sal_Int32 nCount = comphelper::string::getTokenCount(rMacro, '.');
+    const OUString aMethod( rMacro.getToken( nCount-1, '.' ) );
+    OUString aLib;
+    OUString aModule;
     if ( nCount > 2 )
     {
         aLib = rMacro.getToken( 0, '.' );