diff options
author | Eike Rathke <erack@redhat.com> | 2012-11-17 00:27:33 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2012-11-17 00:27:45 +0100 |
commit | 42455e14477b0923b7f0388c3c8672b0fbf8dfd5 (patch) | |
tree | 132ada532d1cf1cd91283d1153771c538539d716 /lingucomponent/source/thesaurus | |
parent | 0ef605d9abc0639875c4e0757d2250bbe847bccb (diff) |
use LanguageTag
Change-Id: I800638b4e4493988c30470359a78850c4149500b
Diffstat (limited to 'lingucomponent/source/thesaurus')
-rw-r--r-- | lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index 981dce45743e..22c96229c916 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/linguistic2/LinguServiceManager.hpp> -#include <i18npool/mslangid.hxx> +#include <i18npool/languagetag.hxx> #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> #include <osl/mutex.hxx> @@ -197,8 +197,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales() k = 0; for (aItB = aLocaleNamesSet.begin(); aItB != aLocaleNamesSet.end(); ++aItB) { - Locale aTmp( MsLangId::convertLanguageToLocale( - MsLangId::convertIsoStringToLanguage( *aItB ))); + Locale aTmp( LanguageTag( *aItB ).getLocale()); aSuppLocales[k++] = aTmp; } @@ -234,8 +233,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales() { aThes[k] = NULL; aTEncs[k] = RTL_TEXTENCODING_DONTKNOW; - aTLocs[k] = MsLangId::convertLanguageToLocale( - MsLangId::convertIsoStringToLanguage( aDictIt->aLocaleNames[i] )); + aTLocs[k] = LanguageTag( aDictIt->aLocaleNames[i] ).getLocale(); aCharSetInfo[k] = new CharClass( aTLocs[k] ); // also both files have to be in the same directory and the // file names must only differ in the extension (.aff/.dic). |