tweak "Convert tools/table.hxx in editeng/forbiddencharacterstable.hxx..."

* remove 'const' from GetForbiddenCharacters
* CharInfoMap -> Map
* pInf -> pForbiddenCharacters
* remove 'inline' from the function defined within the class definition
* some code simplifications

3 files changed, 18 insertions, 20 deletions

diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx b/editeng/inc/editeng/forbiddencharacterstable.hxx
index afe6d5b879e8..55db6db077c9 100644
--- a/editeng/inc/editeng/forbiddencharacterstable.hxx
+++ b/editeng/inc/editeng/forbiddencharacterstable.hxx
@@ -45,17 +45,17 @@ namespace lang {
 class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable : public salhelper::SimpleReferenceObject
 {
 public:
-    typedef std::map<sal_uInt16, com::sun::star::i18n::ForbiddenCharacters> CharInfoMap;
+    typedef std::map<sal_uInt16, com::sun::star::i18n::ForbiddenCharacters> Map;
 private:
-    mutable CharInfoMap maCharInfoMap;
+    Map maMap;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
 
 public:
     SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF);
     ~SvxForbiddenCharactersTable() {}
 
-    inline CharInfoMap& Map() { return maCharInfoMap; }
-    const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters( sal_uInt16 nLanguage, sal_Bool bGetDefault ) const;
+    Map& GetMap() { return maMap; }
+    const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters( sal_uInt16 nLanguage, sal_Bool bGetDefault );
     void    SetForbiddenCharacters(  sal_uInt16 nLanguage , const com::sun::star::i18n::ForbiddenCharacters& );
     void    ClearForbiddenCharacters( sal_uInt16 nLanguage );
 };
diff --git a/editeng/source/misc/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx
index e809282239b0..9760b0f3d076 100644
--- a/editeng/source/misc/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -39,31 +39,29 @@ SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( ::com::sun::star::uno:
     mxMSF = xMSF;
 }
 
-const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, sal_Bool bGetDefault ) const
+const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, sal_Bool bGetDefault )
 {
-    com::sun::star::i18n::ForbiddenCharacters* pInf = NULL;
-    CharInfoMap::iterator it = maCharInfoMap.find( nLanguage );
-    if ( it != maCharInfoMap.end() )
-        pInf = &(it->second);
-    if ( !pInf && bGetDefault && mxMSF.is() )
+    com::sun::star::i18n::ForbiddenCharacters* pForbiddenCharacters = NULL;
+    Map::iterator it = maMap.find( nLanguage );
+    if ( it != maMap.end() )
+        pForbiddenCharacters = &(it->second);
+    else if ( bGetDefault && mxMSF.is() )
     {
         LocaleDataWrapper aWrapper( mxMSF, SvxCreateLocale( nLanguage ) );
-        maCharInfoMap[ nLanguage ] = aWrapper.getForbiddenCharacters();
-        pInf = &maCharInfoMap[ nLanguage ];
+        maMap[ nLanguage ] = aWrapper.getForbiddenCharacters();
+        pForbiddenCharacters = &maMap[ nLanguage ];
     }
-    return pInf;
+    return pForbiddenCharacters;
 }
 
 void SvxForbiddenCharactersTable::SetForbiddenCharacters( sal_uInt16 nLanguage, const com::sun::star::i18n::ForbiddenCharacters& rForbiddenChars )
 {
-    maCharInfoMap[ nLanguage ] = rForbiddenChars;
+    maMap[ nLanguage ] = rForbiddenChars;
 }
 
 void SvxForbiddenCharactersTable::ClearForbiddenCharacters( sal_uInt16 nLanguage )
 {
-    CharInfoMap::iterator it = maCharInfoMap.find( nLanguage );
-    if ( it != maCharInfoMap.end() )
-        maCharInfoMap.erase( it );
+    maMap.erase( nLanguage );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index 5d2c79e6e97d..5957520ff0bb 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -117,15 +117,15 @@ Sequence< Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales()
 {
     SolarMutexGuard aGuard;
 
-    const sal_Int32 nCount = mxForbiddenChars.is() ? mxForbiddenChars->Map().size() : 0;
+    const sal_Int32 nCount = mxForbiddenChars.is() ? mxForbiddenChars->GetMap().size() : 0;
 
     Sequence< Locale > aLocales( nCount );
     if( nCount )
     {
         Locale* pLocales = aLocales.getArray();
 
-        for( SvxForbiddenCharactersTable::CharInfoMap::iterator it = mxForbiddenChars->Map().begin();
-             it != mxForbiddenChars->Map().end(); ++it )
+        for( SvxForbiddenCharactersTable::Map::iterator it = mxForbiddenChars->GetMap().begin();
+             it != mxForbiddenChars->GetMap().end(); ++it )
         {
             const sal_uLong nLanguage = it->first;
             SvxLanguageToLocale ( *pLocales++, static_cast < LanguageType > (nLanguage) );