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
---
 editeng/source/items/numitem.cxx | 7 ++-----
 editeng/source/items/svxfont.cxx | 6 ++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'editeng/source/items')

diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index a8612478b19b..5cf1227c4238 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -100,9 +100,8 @@ SvxNumberType::~SvxNumberType()
 
 String SvxNumberType::GetNumStr( sal_uLong nNo ) const
 {
-    LanguageType eLang = Application::GetSettings().GetLanguageTag().getLanguageType();
-    Locale aLocale = SvxCreateLocale(eLang);
-    return GetNumStr( nNo, aLocale );
+    const LanguageTag& rLang = Application::GetSettings().GetLanguageTag();
+    return GetNumStr( nNo, rLang.getLocale() );
 }
 
 String  SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const
@@ -562,8 +561,6 @@ SvxNumRule::SvxNumRule( sal_uLong nFeatures,
       bContinuousNumbering(bCont)
 {
     ++nRefCount;
-    LanguageType eLang = Application::GetSettings().GetLanguageTag().getLanguageType();
-    aLocale = SvxCreateLocale(eLang);
     for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
         if(i < nLevels)
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 61cf0db1d689..9bbddf4a74bd 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -110,7 +110,8 @@ OUString SvxFont::CalcCaseMap(const OUString &rTxt) const
     const LanguageType eLng = LANGUAGE_DONTKNOW == eLang
                             ? LANGUAGE_SYSTEM : eLang;
 
-    CharClass aCharClass( LanguageTag( SvxCreateLocale( eLng )) );
+    LanguageTag aLanguageTag( eLng);
+    CharClass aCharClass( aLanguageTag );
 
     switch( eCaseMap )
     {
@@ -221,7 +222,8 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
     const LanguageType eLng = LANGUAGE_DONTKNOW == eLang
                             ? LANGUAGE_SYSTEM : eLang;
 
-    CharClass   aCharClass( LanguageTag( SvxCreateLocale( eLng )) );
+    LanguageTag aLanguageTag( eLng );
+    CharClass   aCharClass( aLanguageTag );
     String      aCharString;
 
     while( nPos < nTxtLen )
-- 
cgit