[Libreoffice-commits] .: editeng/source sw/source

[Libreoffice Gerrit user]

 editeng/source/editeng/editview.cxx |    8 ++++----
 editeng/source/editeng/impedit4.cxx |    4 ++--
 editeng/source/misc/unolingu.cxx    |    2 +-
 sw/source/ui/lingu/olmenu.cxx       |    8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 117184c3e14bb01cc4482bb2a47569008358e6fc
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Nov 24 19:03:56 2012 +0100

    kill a few more SvxCreateLocale() & Co remainders
    
    Change-Id: I2b70bf76a495b9edb79b5b3c4ae1b06abed30f54

diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index d40ac27..461a1f7 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -130,10 +130,10 @@ static LanguageType lcl_CheckLanguage(
         // en-US
         aLangList[3] = LANGUAGE_ENGLISH_US;
 #ifdef DEBUG
-        lang::Locale a0( SvxCreateLocale( aLangList[0] ) );
-        lang::Locale a1( SvxCreateLocale( aLangList[1] ) );
-        lang::Locale a2( SvxCreateLocale( aLangList[2] ) );
-        lang::Locale a3( SvxCreateLocale( aLangList[3] ) );
+        lang::Locale a0( LanguageTag( aLangList[0] ).getLocale() );
+        lang::Locale a1( LanguageTag( aLangList[1] ).getLocale() );
+        lang::Locale a2( LanguageTag( aLangList[2] ).getLocale() );
+        lang::Locale a3( LanguageTag( aLangList[3] ).getLocale() );
 #endif
 
         sal_Int32 nCount = sizeof (aLangList) / sizeof (aLangList[0]);
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index d885d8d..d66e1b5 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1500,7 +1500,7 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
                 ++nStart;
             LanguageType nLangFound = pEditEngine->GetLanguage( k, nStart );
 #ifdef DEBUG
-            lang::Locale aLocale( SvxCreateLocale( nLangFound ) );
+            lang::Locale aLocale( LanguageTag( nLangFound ).getLocale() );
 #endif
             bHasConvTxt =   (nSrcLang == nLangFound) ||
                             (editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
@@ -1692,7 +1692,7 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
             sal_uInt16 nLangIdx = nEnd > nStart ? nStart + 1 : nStart;
             LanguageType nLangFound = pEditEngine->GetLanguage( aCurStart.nPara, nLangIdx );
 #ifdef DEBUG
-            lang::Locale aLocale( SvxCreateLocale( nLangFound ) );
+            lang::Locale aLocale( LanguageTag( nLangFound ).getLocale() );
 #endif
             sal_Bool bLangOk =  (nLangFound == nSrcLang) ||
                                 (editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 5c78f07..7fa98c1 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -741,7 +741,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard()
     uno::Reference< XStorable >      xStor( xDic, UNO_QUERY );
     OSL_ENSURE( xDic.is() && xDic->getDictionaryType() == DictionaryType_POSITIVE,
             "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");
     OSL_ENSURE( !xStor.is() || (xStor->hasLocation() && !xStor->isReadonly()),
             "dictionary not editable" );
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index f5d24ca..f337aa8 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -157,10 +157,10 @@ static LanguageType lcl_CheckLanguage(
         // en-US
         aLangList[3] = LANGUAGE_ENGLISH_US;
 #if OSL_DEBUG_LEVEL > 1
-        lang::Locale a0( SvxCreateLocale( aLangList[0] ) );
-        lang::Locale a1( SvxCreateLocale( aLangList[1] ) );
-        lang::Locale a2( SvxCreateLocale( aLangList[2] ) );
-        lang::Locale a3( SvxCreateLocale( aLangList[3] ) );
+        lang::Locale a0( LanguageTag( aLangList[0] ).getLocale() );
+        lang::Locale a1( LanguageTag( aLangList[1] ).getLocale() );
+        lang::Locale a2( LanguageTag( aLangList[2] ).getLocale() );
+        lang::Locale a3( LanguageTag( aLangList[3] ).getLocale() );
 #endif
 
         sal_Int32 nCount = SAL_N_ELEMENTS(aLangList);