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/hyphenator/altlinuxhyph | |
| parent | 0ef605d9abc0639875c4e0757d2250bbe847bccb (diff) | |
use LanguageTag
Change-Id: I800638b4e4493988c30470359a78850c4149500b
Diffstat (limited to 'lingucomponent/source/hyphenator/altlinuxhyph')
| -rw-r--r-- | lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index ff2d267719a5..4582a663867a 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -22,7 +22,7 @@ #include <cppuhelper/factory.hxx> // helper for factories #include <com/sun/star/registry/XRegistryKey.hpp> -#include <i18npool/mslangid.hxx> +#include <i18npool/languagetag.hxx> #include <tools/debug.hxx> #include <osl/mutex.hxx> @@ -172,8 +172,7 @@ Sequence< Locale > SAL_CALL Hyphenator::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; } @@ -205,8 +204,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales() { aDicts[k].aPtr = NULL; aDicts[k].eEnc = RTL_TEXTENCODING_DONTKNOW; - aDicts[k].aLoc = MsLangId::convertLanguageToLocale( - MsLangId::convertIsoStringToLanguage( aDictIt->aLocaleNames[i] )); + aDicts[k].aLoc = LanguageTag( aDictIt->aLocaleNames[i] ).getLocale(); aDicts[k].apCC = new CharClass( aDicts[k].aLoc ); // also both files have to be in the same directory and the // file names must only differ in the extension (.aff/.dic). |