diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-17 01:03:36 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-17 01:03:48 +0100 |
| commit | 577b95a96092b50b454ad2d5a12edc35120db1d6 (patch) | |
| tree | a4b96ed1999e04a50e9339894a64d2d3911a9d84 /shell | |
| parent | 8a6c5b2fcbf2b6d87529e91f58aa41c02d0fc990 (diff) | |
use LanguageTag
Change-Id: I1ec1f619cb6b427b4376d28292d3412ba6eb67ee
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/tools/lngconvex/lngconvex.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index 473bf6999abf..942ae75ea154 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -53,7 +53,7 @@ typedef unsigned short WORD; #include "sal/main.h" #include "tools/config.hxx" -#include "i18npool/mslangid.hxx" +#include "i18npool/languagetag.hxx" #include <iostream> #include <fstream> @@ -332,7 +332,9 @@ void add_group_entries( rtl::OString iso_lang = aConfig.GetKeyName(sal::static_int_cast<sal_uInt16>(i)); rtl::OString key_value_utf8 = aConfig.ReadKey(sal::static_int_cast<sal_uInt16>(i)); iso_lang_identifier myiso_lang( iso_lang ); - LanguageType ltype = MsLangId::convertIsoNamesToLanguage(myiso_lang.language(), myiso_lang.country()); + LanguageType ltype = LanguageTag( + OStringToOUString( myiso_lang.language(), RTL_TEXTENCODING_UTF8), + OStringToOUString( myiso_lang.country(), RTL_TEXTENCODING_UTF8)).getLanguageType(); if( ( ltype & 0x0200 ) == 0 && map[ ltype ].empty() ) { Substitutor.set_language(iso_lang_identifier(iso_lang)); @@ -459,7 +461,9 @@ void start_language_section( std::string lang_section("LANGUAGE "); - LanguageType ltype = MsLangId::convertIsoNamesToLanguage(iso_lang.language(), iso_lang.country()); + LanguageType ltype = LanguageTag( + OStringToOUString( iso_lang.language(), RTL_TEXTENCODING_UTF8), + OStringToOUString( iso_lang.country(), RTL_TEXTENCODING_UTF8)).getLanguageType(); char buff[10]; int primLangID = PRIMARYLANGID(ltype); |