diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-02-15 20:44:26 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-02-15 21:31:29 +0400 |
| commit | 843eafc765a3d1d0ea4c9a89855c73e81784aa8b (patch) | |
| tree | d0514cd793f7539cc5fa0f412daff53a3c5940dd /editeng/source/misc/forbiddencharacterstable.cxx | |
| parent | 9d4b0c25a598a53601e2bd337443728f17f8296a (diff) | |
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
Diffstat (limited to 'editeng/source/misc/forbiddencharacterstable.cxx')
| -rw-r--r-- | editeng/source/misc/forbiddencharacterstable.cxx | 24 |
1 files changed, 11 insertions, 13 deletions
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: */ |