From 41956321ceefb5836feb2c119b66de7bb557740f Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Sat, 24 Nov 2012 18:54:09 +0100 Subject: get rid of Svx...Locale...() double conversion nonsense Change-Id: I21d14ff6087d1adb0ce769f2e8f8060a005250cc --- editeng/source/uno/UnoForbiddenCharsTable.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'editeng/source/uno') diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx index cee34d950507..12dcee9be9a0 100644 --- a/editeng/source/uno/UnoForbiddenCharsTable.cxx +++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx @@ -52,7 +52,7 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Loc if(!mxForbiddenChars.is()) throw RuntimeException(); - const LanguageType eLang = SvxLocaleToLanguage( rLocale ); + const LanguageType eLang = LanguageTag( rLocale ).getLanguageType(); const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, sal_False ); if(!pForbidden) throw NoSuchElementException(); @@ -68,7 +68,7 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocal if(!mxForbiddenChars.is()) return sal_False; - const LanguageType eLang = SvxLocaleToLanguage( rLocale ); + const LanguageType eLang = LanguageTag( rLocale ).getLanguageType(); const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, sal_False ); return NULL != pForbidden; @@ -82,7 +82,7 @@ void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const Locale& rLocale, co if(!mxForbiddenChars.is()) throw RuntimeException(); - const LanguageType eLang = SvxLocaleToLanguage( rLocale ); + const LanguageType eLang = LanguageTag( rLocale ).getLanguageType(); mxForbiddenChars->SetForbiddenCharacters( eLang, rForbiddenCharacters ); onChange(); @@ -96,7 +96,7 @@ void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const Locale& rLocale if(!mxForbiddenChars.is()) throw RuntimeException(); - const LanguageType eLang = SvxLocaleToLanguage( rLocale ); + const LanguageType eLang = LanguageTag( rLocale ).getLanguageType(); mxForbiddenChars->ClearForbiddenCharacters( eLang ); onChange(); @@ -119,7 +119,7 @@ Sequence< Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales() it != mxForbiddenChars->GetMap().end(); ++it ) { const sal_uLong nLanguage = it->first; - SvxLanguageToLocale ( *pLocales++, static_cast < LanguageType > (nLanguage) ); + *pLocales++ = LanguageTag( static_cast < LanguageType > (nLanguage) ).getLocale(); } } -- cgit