Kaydet (Commit) 117184c3 authored tarafından Eike Rathke's avatar Eike Rathke

kill a few more SvxCreateLocale() & Co remainders

Change-Id: I2b70bf76a495b9edb79b5b3c4ae1b06abed30f54
üst d15436e5
...@@ -130,10 +130,10 @@ static LanguageType lcl_CheckLanguage( ...@@ -130,10 +130,10 @@ static LanguageType lcl_CheckLanguage(
// en-US // en-US
aLangList[3] = LANGUAGE_ENGLISH_US; aLangList[3] = LANGUAGE_ENGLISH_US;
#ifdef DEBUG #ifdef DEBUG
lang::Locale a0( SvxCreateLocale( aLangList[0] ) ); lang::Locale a0( LanguageTag( aLangList[0] ).getLocale() );
lang::Locale a1( SvxCreateLocale( aLangList[1] ) ); lang::Locale a1( LanguageTag( aLangList[1] ).getLocale() );
lang::Locale a2( SvxCreateLocale( aLangList[2] ) ); lang::Locale a2( LanguageTag( aLangList[2] ).getLocale() );
lang::Locale a3( SvxCreateLocale( aLangList[3] ) ); lang::Locale a3( LanguageTag( aLangList[3] ).getLocale() );
#endif #endif
sal_Int32 nCount = sizeof (aLangList) / sizeof (aLangList[0]); sal_Int32 nCount = sizeof (aLangList) / sizeof (aLangList[0]);
......
...@@ -1500,7 +1500,7 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang ) ...@@ -1500,7 +1500,7 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
++nStart; ++nStart;
LanguageType nLangFound = pEditEngine->GetLanguage( k, nStart ); LanguageType nLangFound = pEditEngine->GetLanguage( k, nStart );
#ifdef DEBUG #ifdef DEBUG
lang::Locale aLocale( SvxCreateLocale( nLangFound ) ); lang::Locale aLocale( LanguageTag( nLangFound ).getLocale() );
#endif #endif
bHasConvTxt = (nSrcLang == nLangFound) || bHasConvTxt = (nSrcLang == nLangFound) ||
(editeng::HangulHanjaConversion::IsChinese( nLangFound ) && (editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
...@@ -1692,7 +1692,7 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL ...@@ -1692,7 +1692,7 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
sal_uInt16 nLangIdx = nEnd > nStart ? nStart + 1 : nStart; sal_uInt16 nLangIdx = nEnd > nStart ? nStart + 1 : nStart;
LanguageType nLangFound = pEditEngine->GetLanguage( aCurStart.nPara, nLangIdx ); LanguageType nLangFound = pEditEngine->GetLanguage( aCurStart.nPara, nLangIdx );
#ifdef DEBUG #ifdef DEBUG
lang::Locale aLocale( SvxCreateLocale( nLangFound ) ); lang::Locale aLocale( LanguageTag( nLangFound ).getLocale() );
#endif #endif
sal_Bool bLangOk = (nLangFound == nSrcLang) || sal_Bool bLangOk = (nLangFound == nSrcLang) ||
(editeng::HangulHanjaConversion::IsChinese( nLangFound ) && (editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
......
...@@ -741,7 +741,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard() ...@@ -741,7 +741,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard()
uno::Reference< XStorable > xStor( xDic, UNO_QUERY ); uno::Reference< XStorable > xStor( xDic, UNO_QUERY );
OSL_ENSURE( xDic.is() && xDic->getDictionaryType() == DictionaryType_POSITIVE, OSL_ENSURE( xDic.is() && xDic->getDictionaryType() == DictionaryType_POSITIVE,
"wrong dictionary type"); "wrong dictionary type");
OSL_ENSURE( xDic.is() && SvxLocaleToLanguage( xDic->getLocale() ) == LANGUAGE_NONE, OSL_ENSURE( xDic.is() && LanguageTag( xDic->getLocale() ).getLanguageType() == LANGUAGE_NONE,
"wrong dictionary language"); "wrong dictionary language");
OSL_ENSURE( !xStor.is() || (xStor->hasLocation() && !xStor->isReadonly()), OSL_ENSURE( !xStor.is() || (xStor->hasLocation() && !xStor->isReadonly()),
"dictionary not editable" ); "dictionary not editable" );
......
...@@ -157,10 +157,10 @@ static LanguageType lcl_CheckLanguage( ...@@ -157,10 +157,10 @@ static LanguageType lcl_CheckLanguage(
// en-US // en-US
aLangList[3] = LANGUAGE_ENGLISH_US; aLangList[3] = LANGUAGE_ENGLISH_US;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
lang::Locale a0( SvxCreateLocale( aLangList[0] ) ); lang::Locale a0( LanguageTag( aLangList[0] ).getLocale() );
lang::Locale a1( SvxCreateLocale( aLangList[1] ) ); lang::Locale a1( LanguageTag( aLangList[1] ).getLocale() );
lang::Locale a2( SvxCreateLocale( aLangList[2] ) ); lang::Locale a2( LanguageTag( aLangList[2] ).getLocale() );
lang::Locale a3( SvxCreateLocale( aLangList[3] ) ); lang::Locale a3( LanguageTag( aLangList[3] ).getLocale() );
#endif #endif
sal_Int32 nCount = SAL_N_ELEMENTS(aLangList); sal_Int32 nCount = SAL_N_ELEMENTS(aLangList);
......
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