From 41956321ceefb5836feb2c119b66de7bb557740f Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Sat, 24 Nov 2012 18:54:09 +0100
Subject: get rid of Svx...Locale...() double conversion nonsense

Change-Id: I21d14ff6087d1adb0ce769f2e8f8060a005250cc
---
 basctl/source/basicide/basicbox.cxx |  2 +-
 basctl/source/dlged/managelang.cxx  | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'basctl')

diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 5d278c2b86cf..5b6b39976a69 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -416,7 +416,7 @@ void LanguageBox::FillBox()
         {
             bool bIsDefault = localesAreEqual( aDefaultLocale, pLocale[i] );
             bool bIsCurrent = localesAreEqual( aCurrentLocale, pLocale[i] );
-            LanguageType eLangType = SvxLocaleToLanguage( pLocale[i] );
+            LanguageType eLangType = LanguageTag( pLocale[i] ).getLanguageType();
             String sLanguage = aLangTable.GetString( eLangType );
             if ( bIsDefault )
             {
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index b58b3266b178..1efc75e482ee 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -170,7 +170,7 @@ void ManageLanguageDialog::FillLanguageBox()
         for ( i = 0;  i < nCount;  ++i )
         {
             bool bIsDefault = localesAreEqual( aDefaultLocale, pLocale[i] );
-            LanguageType eLangType = SvxLocaleToLanguage( pLocale[i] );
+            LanguageType eLangType = LanguageTag( pLocale[i] ).getLanguageType();
             OUStringBuffer sLanguageBuf(aLangTable.GetString( eLangType ));
             if ( bIsDefault )
             {
@@ -325,7 +325,7 @@ void SetDefaultLanguageDialog::FillLanguageBox()
     const Locale* pLocale = aLocaleSeq.getConstArray();
     sal_Int32 i, nCount = aLocaleSeq.getLength();
     for ( i = 0;  i < nCount;  ++i )
-        m_pLanguageLB->RemoveLanguage( SvxLocaleToLanguage( pLocale[i] ) );
+        m_pLanguageLB->RemoveLanguage( LanguageTag( pLocale[i] ).getLanguageType() );
 
     // fill checklistbox if not in default mode
     if ( m_pLocalizationMgr->isLibraryLocalized() )
@@ -379,9 +379,7 @@ Sequence< Locale > SetDefaultLanguageDialog::GetLocales() const
     Sequence< Locale > aLocaleSeq( nSize );
     if ( bNotLocalized )
     {
-        Locale aLocale;
-        SvxLanguageToLocale( aLocale, m_pLanguageLB->GetSelectLanguage() );
-        aLocaleSeq[0] = aLocale;
+        aLocaleSeq[0] = LanguageTag( m_pLanguageLB->GetSelectLanguage() ).getLocale();
     }
     else
     {
@@ -392,9 +390,7 @@ Sequence< Locale > SetDefaultLanguageDialog::GetLocales() const
             if ( m_pCheckLangLB->IsChecked(i) )
             {
                 LanguageType eType = LanguageType( (sal_uLong)m_pCheckLangLB->GetEntryData(i) );
-                Locale aLocale;
-                SvxLanguageToLocale( aLocale, eType );
-                aLocaleSeq[j++] = aLocale;
+                aLocaleSeq[j++] = LanguageTag( eType ).getLocale();
             }
         }
         DBG_ASSERT( nSize == j, "SetDefaultLanguageDialog::GetLocales(): invalid indexes" );
-- 
cgit