From b8a467b70756b83c8aeb77f385ea1e368350d370 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 21 Nov 2012 18:34:53 +0100 Subject: obtain LanguageTag from SvtSysLocale Change-Id: Iaee25f1d92349704eaae45e6582d31dfa718ddcb --- svl/source/config/ctloptions.cxx | 2 +- svl/source/config/languageoptions.cxx | 2 +- svl/source/items/style.cxx | 2 +- svl/source/numbers/zforlist.cxx | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'svl') diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 36d8df1a7507..9a4fcb1d2caa 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -293,7 +293,7 @@ void SvtCTLOptions_Impl::Load() ((eSystemLanguage != LANGUAGE_SYSTEM) && ( nWinScript & SCRIPTTYPE_COMPLEX ))) ) { m_bCTLFontEnabled = sal_True; - sal_uInt16 nLanguage = SvtSysLocale().GetLanguage(); + sal_uInt16 nLanguage = SvtSysLocale().GetLanguageTag().getLanguageType(); //enable sequence checking for the appropriate languages m_bCTLSequenceChecking = m_bCTLRestricted = m_bCTLTypeAndReplace = (MsLangId::needsSequenceChecking( nLanguage) || diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index c73318c91658..cdf61e81f271 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -149,7 +149,7 @@ sal_uInt16 SvtLanguageOptions::GetScriptTypeOfLanguage( sal_uInt16 nLang ) if( LANGUAGE_DONTKNOW == nLang ) nLang = LANGUAGE_ENGLISH_US; else if( LANGUAGE_SYSTEM == nLang ) - nLang = SvtSysLocale().GetLanguage(); + nLang = SvtSysLocale().GetLanguageTag().getLanguageType(); sal_Int16 nScriptType = MsLangId::getScriptType( nLang ); sal_uInt16 nScript; diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 1c8a7c858bbf..1bc6d17e050c 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -334,7 +334,7 @@ XubString SfxStyleSheetBase::GetDescription( SfxMapUnit eMetric ) const SfxPoolItem* pItem = aIter.FirstItem(); IntlWrapper aIntlWrapper(comphelper::getProcessServiceFactory(), - SvtSysLocale().GetLanguage()); + SvtSysLocale().GetLanguageTag().getLocale()); while ( pItem ) { XubString aItemPresentation; diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index f6094178aea0..af30c94595ca 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -636,13 +636,13 @@ sal_uInt32 SvNumberFormatter::GetIndexPuttingAndConverting( String & rString, // #62389# empty format string (of Writer) => General standard format if (!rString.Len()) ; // nothing - else if (eLnge == LANGUAGE_SYSTEM && eSysLnge != SvtSysLocale().GetLanguage()) + else if (eLnge == LANGUAGE_SYSTEM && eSysLnge != SvtSysLocale().GetLanguageTag().getLanguageType()) { sal_uInt32 nOrig = GetEntryKey( rString, eSysLnge ); if (nOrig == NUMBERFORMAT_ENTRY_NOT_FOUND) nKey = nOrig; // none avaliable, maybe user-defined else - nKey = GetFormatForLanguageIfBuiltIn( nOrig, SvtSysLocale().GetLanguage() ); + nKey = GetFormatForLanguageIfBuiltIn( nOrig, SvtSysLocale().GetLanguageTag().getLanguageType() ); if (nKey == nOrig) { @@ -651,7 +651,7 @@ sal_uInt32 SvNumberFormatter::GetIndexPuttingAndConverting( String & rString, // language and wouldn't match eSysLnge anymore, do that on a copy. String aTmp( rString); rNewInserted = PutandConvertEntrySystem( aTmp, rCheckPos, rType, - nKey, eLnge, SvtSysLocale().GetLanguage()); + nKey, eLnge, SvtSysLocale().GetLanguageTag().getLanguageType()); if (rCheckPos > 0) { SAL_WARN( "svl.numbers", "SvNumberFormatter::GetIndexPuttingAndConverting: bad format code string for current locale"); @@ -702,7 +702,7 @@ void SvNumberFormatter::DeleteEntry(sal_uInt32 nKey) bool SvNumberFormatter::Load( SvStream& rStream ) { - LanguageType eSysLang = SvtSysLocale().GetLanguage(); + LanguageType eSysLang = SvtSysLocale().GetLanguageTag().getLanguageType(); SvNumberFormatter* pConverter = NULL; ImpSvNumMultipleReadHeader aHdr( rStream ); @@ -802,7 +802,7 @@ bool SvNumberFormatter::Save( SvStream& rStream ) const // As of 364i we store what SYSTEM locale really was, before it was hard // coded LANGUAGE_SYSTEM. rStream << (sal_uInt16) SV_NUMBERFORMATTER_VERSION; - rStream << (sal_uInt16) SvtSysLocale().GetLanguage() << (sal_uInt16) IniLnge; + rStream << (sal_uInt16) SvtSysLocale().GetLanguageTag().getLanguageType() << (sal_uInt16) IniLnge; const SvNumberFormatTable* pTable = &aFTable; SvNumberFormatTable::const_iterator it = pTable->begin(); while (it != pTable->end()) @@ -3167,7 +3167,7 @@ void SvNumberFormatter::SetDefaultSystemCurrency( const String& rAbbrev, Languag { ::osl::MutexGuard aGuard( GetMutex() ); if ( eLang == LANGUAGE_SYSTEM ) - eLang = SvtSysLocale().GetLanguage(); + eLang = SvtSysLocale().GetLanguageTag().getLanguageType(); const NfCurrencyTable& rTable = GetTheCurrencyTable(); sal_uInt16 nCount = rTable.size(); if ( rAbbrev.Len() ) @@ -3562,10 +3562,10 @@ void SvNumberFormatter::ImpInitCurrencyTable() RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svl", "er93726", "SvNumberFormatter::ImpInitCurrencyTable" ); - LanguageType eSysLang = SvtSysLocale().GetLanguage(); + LanguageType eSysLang = SvtSysLocale().GetLanguageTag().getLanguageType(); LocaleDataWrapper* pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessComponentContext(), - LanguageTag( eSysLang ).getLocale() ); + SvtSysLocale().GetLanguageTag().getLocale() ); // get user configured currency String aConfiguredCurrencyAbbrev; LanguageType eConfiguredCurrencyLanguage = LANGUAGE_SYSTEM; -- cgit