mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use LanguageTag

Browse Source 
Change-Id: I28aff5533ec6cc31a3d6f3de3198452bd716ba62
This commit is contained in:
Eike Rathke
2012-11-16 15:57:22 +01:00
parent e055182f27
commit 59d33fcc19
7 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
svl/source/config/languageoptions.cxx
View File

@@ -22,6 +22,7 @@
#include <svl/cjkoptions.hxx>
#include <svl/ctloptions.hxx>
#include <i18npool/mslangid.hxx>
#include <i18npool/languagetag.hxx>
#include <osl/mutex.hxx>
#include <rtl/instance.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
@@ -200,7 +201,7 @@ LanguageType SvtSystemLanguageOptions::GetWin16SystemLanguage()
{
if( m_sWin16SystemLocale.isEmpty() )
return LANGUAGE_NONE;
return MsLangId::convertIsoStringToLanguage( m_sWin16SystemLocale );
return LanguageTag( m_sWin16SystemLocale ).getLanguageType();
}

6
svl/source/items/srchitem.cxx
View File

@@ -28,7 +28,7 @@
#include <com/sun/star/util/XReplaceDescriptor.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <svl/memberid.hrc>
#include <i18npool/mslangid.hxx>
#include <i18npool/languagetag.hxx>
using namespace utl;
using namespace com::sun::star::beans;
@@ -428,7 +428,7 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
{
sal_Int16 nLocale;
if (!aSearchOpt.Locale.Language.isEmpty() || !aSearchOpt.Locale.Country.isEmpty() )
nLocale = MsLangId::convertLocaleToLanguage( aSearchOpt.Locale );
nLocale = LanguageTag( aSearchOpt.Locale ).getLanguageType();
else
nLocale = LANGUAGE_NONE;
rVal <<= nLocale;
@@ -577,7 +577,7 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM
}
else
{
MsLangId::convertLanguageToLocale( (sal_Int16) nInt, aSearchOpt.Locale );
aSearchOpt.Locale = LanguageTag( nInt).getLocale();
}
}
break;

8
svl/source/numbers/numfmuno.cxx
View File

@@ -109,7 +109,7 @@ static LanguageType lcl_GetLanguage( const lang::Locale& rLocale )
if ( rLocale.Language.isEmpty() )
return LANGUAGE_SYSTEM;
LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale );
LanguageType eRet = LanguageTag( rLocale ).getLanguageType( false );
if ( eRet == LANGUAGE_NONE )
eRet = LANGUAGE_SYSTEM; //! or throw an exception?
@@ -757,8 +757,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const rtl::OUString& aPro
}
else if (aString.EqualsAscii( PROPERTYNAME_LOCALE ))
{
lang::Locale aLocale( MsLangId::convertLanguageToLocale(
pFormat->GetLanguage()));
lang::Locale aLocale( LanguageTag( pFormat->GetLanguage()).getLocale());
aRet <<= aLocale;
}
else if (aString.EqualsAscii( PROPERTYNAME_TYPE ))
@@ -893,8 +892,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue
bool bThousand, bRed;
sal_uInt16 nDecimals, nLeading;
pFormat->GetFormatSpecialInfo( bThousand, bRed, nDecimals, nLeading );
lang::Locale aLocale( MsLangId::convertLanguageToLocale(
pFormat->GetLanguage()));
lang::Locale aLocale( LanguageTag( pFormat->GetLanguage()).getLocale());
uno::Sequence<beans::PropertyValue> aSeq(13);
beans::PropertyValue* pArray = aSeq.getArray();

2
svl/source/numbers/supservs.cxx
View File

@@ -101,7 +101,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
{
Locale aLocale;
*pArgs >>= aLocale;
eNewFormatterLanguage = MsLangId::convertLocaleToLanguage( aLocale);
eNewFormatterLanguage = LanguageTag( aLocale).getLanguageType( false);
}
#ifdef DBG_UTIL
else

11
svl/source/numbers/zforlist.cxx
View File

@@ -233,7 +233,7 @@ void SvNumberFormatter::ImpConstruct( LanguageType eLang )
eEvalDateFormat = NF_EVALDATEFORMAT_INTL;
nDefaultSystemCurrencyFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;
aLocale = MsLangId::convertLanguageToLocale( eLang );
aLocale = LanguageTag( eLang ).getLocale();
pCharClass = new CharClass( comphelper::getComponentContext(xServiceManager), aLocale );
xLocaleData.init( comphelper::getComponentContext(xServiceManager), aLocale, eLang );
xCalendar.init( comphelper::getComponentContext(xServiceManager), aLocale );
@@ -266,7 +266,7 @@ void SvNumberFormatter::ChangeIntl(LanguageType eLnge)
{
ActLnge = eLnge;
aLocale = MsLangId::convertLanguageToLocale( eLnge );
aLocale = LanguageTag( eLnge ).getLocale();
pCharClass->setLocale( aLocale );
xLocaleData.changeLocale( aLocale, eLnge );
xCalendar.changeLocale( aLocale );
@@ -1919,7 +1919,7 @@ String SvNumberFormatter::GetFormatDecimalSep( sal_uInt32 nFormat ) const
else
{
::com::sun::star::lang::Locale aSaveLocale( xLocaleData->getLocale() );
::com::sun::star::lang::Locale aTmpLocale(MsLangId::convertLanguageToLocale(pFormat->GetLanguage()));
::com::sun::star::lang::Locale aTmpLocale( LanguageTag( pFormat->GetLanguage()).getLocale());
((SvNumberFormatter*)this)->xLocaleData.changeLocale(aTmpLocale, pFormat->GetLanguage() );
aRet = xLocaleData->getNumDecimalSep();
((SvNumberFormatter*)this)->xLocaleData.changeLocale( aSaveLocale, eSaveLang );
@@ -3547,7 +3547,7 @@ void SvNumberFormatter::ImpInitCurrencyTable()
LanguageType eSysLang = SvtSysLocale().GetLanguage();
LocaleDataWrapper* pLocaleData = new LocaleDataWrapper(
::comphelper::getProcessComponentContext(),
MsLangId::convertLanguageToLocale( eSysLang ) );
LanguageTag( eSysLang ).getLocale() );
// get user configured currency
String aConfiguredCurrencyAbbrev;
LanguageType eConfiguredCurrencyLanguage = LANGUAGE_SYSTEM;
@@ -3573,8 +3573,7 @@ void SvNumberFormatter::ImpInitCurrencyTable()
sal_uInt16 nLegacyOnlyCurrencyPos = 0;
for ( sal_Int32 nLocale = 0; nLocale < nLocaleCount; nLocale++ )
{
LanguageType eLang = MsLangId::convertLocaleToLanguage(
pLocales[nLocale]);
LanguageType eLang = LanguageTag( pLocales[nLocale]).getLanguageType( false);
rInstalledLocales.insert( eLang);
pLocaleData->setLocale( pLocales[nLocale] );
Sequence< Currency2 > aCurrSeq = pLocaleData->getAllCurrencies();

4
svl/source/numbers/zformat.cxx
View File

@@ -4774,7 +4774,7 @@ OUString SvNumberformat::impTransliterateImpl(const OUString& rStr,
const SvNumberNatNum& rNum ) const
{
com::sun::star::lang::Locale aLocale(
MsLangId::convertLanguageToLocale( rNum.GetLang() ) );
LanguageTag( rNum.GetLang() ).getLocale() );
return GetFormatter().GetNatNum()->getNativeNumberString( rStr,
aLocale, rNum.GetNatNum() );
}
@@ -4789,7 +4789,7 @@ void SvNumberformat::GetNatNumXml(
if ( rNum.IsSet() )
{
com::sun::star::lang::Locale aLocale(
MsLangId::convertLanguageToLocale( rNum.GetLang() ) );
LanguageTag( rNum.GetLang() ).getLocale() );
rAttr = GetFormatter().GetNatNum()->convertToXmlAttributes(
aLocale, rNum.GetNatNum() );
}

2
svl/source/numbers/zforscan.cxx
View File

@@ -222,7 +222,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
// #80023# be sure to generate keywords for the loaded Locale, not for the
// requested Locale, otherwise number format codes might not match
lang::Locale aLoadedLocale = pLocaleData->getLoadedLocale();
LanguageType eLang = MsLangId::convertLocaleToLanguage( aLoadedLocale );
LanguageType eLang = LanguageTag( aLoadedLocale ).getLanguageType( false);
NumberFormatCodeWrapper aNumberFormatCode( comphelper::getComponentContext(pFormatter->GetServiceManager()), aLoadedLocale );
i18n::NumberFormatCode aFormat = aNumberFormatCode.getFormatCode( NF_NUMBER_STANDARD );