Skip to content

C
core
Kaydet (Commit) 39c9c742 authored tarafından Eike Rathke's avatar Eike Rathke
Dosyalara gözat
Seçenekler

was convertIsoStringToLanguage(), use convertToLanguageTypeWithFallback() 

Change-Id: Ieea44614271c79beb7a9a3fce35acf921ccb478f
üst 3945267d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
lingucomponent/source/lingutil/lingutil.cxx
Dosyayı görüntüle @ 39c9c742
...@@ -198,7 +198,7 @@ void MergeNewStyleDicsAndOldStyleDics( ...@@ -198,7 +198,7 @@ void MergeNewStyleDicsAndOldStyleDics(
sal_Int32 nLocaleNames = aLocaleNames.getLength(); sal_Int32 nLocaleNames = aLocaleNames.getLength();
for (sal_Int32 k = 0; k < nLocaleNames; ++k) for (sal_Int32 k = 0; k < nLocaleNames; ++k)
{ {
LanguageType nLang = LanguageTag::convertToLanguageType( aLocaleNames[k] ); LanguageType nLang = LanguageTag::convertToLanguageTypeWithFallback( aLocaleNames[k] );
aNewStyleLanguages.insert( nLang ); aNewStyleLanguages.insert( nLang );
} }
} }
...@@ -214,7 +214,7 @@ void MergeNewStyleDicsAndOldStyleDics( ...@@ -214,7 +214,7 @@ void MergeNewStyleDicsAndOldStyleDics(
DBG_ASSERT( nOldStyleDics, "old style dictionary with more then one language found!"); DBG_ASSERT( nOldStyleDics, "old style dictionary with more then one language found!");
if (nOldStyleDics > 0) if (nOldStyleDics > 0)
{ {
LanguageType nLang = LanguageTag::convertToLanguageType( aIt2->aLocaleNames[0] ); LanguageType nLang = LanguageTag::convertToLanguageTypeWithFallback( aIt2->aLocaleNames[0] );
if (nLang == LANGUAGE_DONTKNOW || linguistic::LinguIsUnspecified( nLang)) if (nLang == LANGUAGE_DONTKNOW || linguistic::LinguIsUnspecified( nLang))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment