diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/basflt/fltini.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/css1atr.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlgrin.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 6dccc831ecd5..963156e236d5 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -623,7 +623,7 @@ void SwAsciiOptions::ReadUserData( const String& rStr ) sFont = sToken; break; case 3: // Language - nLanguage = LanguageTag( sToken ).getLanguageType(); + nLanguage = LanguageTag::convertToLanguageType( sToken ); break; } } @@ -659,7 +659,7 @@ void SwAsciiOptions::WriteUserData( String& rStr ) // 4. Language if (nLanguage) { - OUString sTmp = LanguageTag( nLanguage ).getBcp47(); + OUString sTmp = LanguageTag::convertToBcp47( nLanguage ); rStr += (String)sTmp; } rStr += ','; diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index effb4a80112b..155eaa6025bc 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -2754,7 +2754,7 @@ static Writer& OutCSS1_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt ) if( LANGUAGE_DONTKNOW == eLang ) return rWrt; - String sOut = LanguageTag( eLang ).getBcp47(); + String sOut = LanguageTag::convertToBcp47( eLang ); rHTMLWrt.OutCSS1_Property( sCSS1_P_so_language, sOut ); diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 6423ce55a1b9..3ac6243f6ad9 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1942,7 +1942,7 @@ sal_Bool SwHTMLParser::ParseStyleOptions( const String &rStyle, if( pLang && pLang->Len() ) { - LanguageType eLang = LanguageTag( *pLang ).getLanguageType(); + LanguageType eLang = LanguageTag::convertToLanguageType( *pLang ); if( LANGUAGE_DONTKNOW != eLang ) { SvxLanguageItem aLang( eLang, RES_CHRATR_LANGUAGE ); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index de89a5926d0c..aa4a93351feb 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -987,7 +987,7 @@ void SwHTMLParser::InsertBodyOptions() } if( aLang.Len() ) { - LanguageType eLang = LanguageTag( aLang ).getLanguageType(); + LanguageType eLang = LanguageTag::convertToLanguageType( aLang ); if( LANGUAGE_DONTKNOW != eLang ) { sal_uInt16 nWhich = 0; diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 124e79f5cf9a..5df779fb17fe 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -1180,7 +1180,7 @@ void SwHTMLWriter::OutLanguage( LanguageType nLang ) sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_lang) .append("=\""); Strm() << sOut.makeStringAndClear().getStr(); - HTMLOutFuncs::Out_String( Strm(), LanguageTag(nLang).getBcp47(), + HTMLOutFuncs::Out_String( Strm(), LanguageTag::convertToBcp47(nLang), eDestEnc, &aNonConvertableCharacters ) << '"'; } } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index d7697ca0d749..1c0e257f35ce 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1199,7 +1199,7 @@ void DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen nPos, co // lid lang::Locale aLocale( SwBreakIt::Get()->GetLocale( rNode.GetLang( nPos ) ) ); - OUString sLang( LanguageTag( aLocale).getBcp47() ); + OUString sLang( LanguageTag::convertToBcp47( aLocale) ); m_pSerializer->singleElementNS( XML_w, XML_lid, FSNS( XML_w, XML_val ), OUStringToOString( sLang, RTL_TEXTENCODING_UTF8 ).getStr( ), FSEND ); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 32dc410f9f11..ce231d65fa78 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2424,7 +2424,7 @@ CharSet SwWW8ImplReader::GetCurrentCharSet() */ const SvxLanguageItem *pLang = (const SvxLanguageItem*)GetFmtAttr(RES_CHRATR_LANGUAGE); LanguageType eLang = pLang ? pLang->GetLanguage() : LANGUAGE_SYSTEM; - ::com::sun::star::lang::Locale aLocale(LanguageTag(eLang).getLocale()); + ::com::sun::star::lang::Locale aLocale(LanguageTag::convertToLocale(eLang)); eSrcCharSet = msfilter::util::getBestTextEncodingFromLocale(aLocale); } } |