diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-01 10:33:48 -0500 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-02 07:31:30 +0000 |
| commit | 6a08067902ddc0ec61a7c7b4b0035b303f643a50 (patch) | |
| tree | cd49d1824cd169d9d224925b836eaa70de27414e /svl | |
| parent | 82a1d75ee59c46e6bb361b98c520cc4eff2e770c (diff) | |
OUString convertion for unotools
Change-Id: Ifae7f344e3827875e32afa3cda23c771f5735707
Reviewed-on: https://gerrit.libreoffice.org/4659
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index abfe9c94684c..2dba599fb4b8 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3274,7 +3274,7 @@ const NfCurrencyEntry* SvNumberFormatter::GetLegacyOnlyCurrencyEntry( const OUSt IMPL_STATIC_LINK_NOINSTANCE( SvNumberFormatter, CurrencyChangeLink, SAL_UNUSED_PARAMETER void*, EMPTYARG ) { ::osl::MutexGuard aGuard( GetMutex() ); - String aAbbrev; + OUString aAbbrev; LanguageType eLang = LANGUAGE_SYSTEM; SvtSysLocaleOptions().GetCurrencyAbbrevAndLanguage( aAbbrev, eLang ); SetDefaultSystemCurrency( aAbbrev, eLang ); @@ -3707,7 +3707,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() ::comphelper::getProcessComponentContext(), SvtSysLocale().GetLanguageTag() ); // get user configured currency - String aConfiguredCurrencyAbbrev; + OUString aConfiguredCurrencyAbbrev; LanguageType eConfiguredCurrencyLanguage = LANGUAGE_SYSTEM; SvtSysLocaleOptions().GetCurrencyAbbrevAndLanguage( aConfiguredCurrencyAbbrev, eConfiguredCurrencyLanguage ); @@ -3758,7 +3758,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() lcl_CheckCurrencySymbolPosition( *pEntry ); } rCurrencyTable.insert( rCurrencyTable.begin() + nCurrencyPos++, pEntry ); - if ( !nSystemCurrencyPosition && (aConfiguredCurrencyAbbrev.Len() ? + if ( !nSystemCurrencyPosition && (!aConfiguredCurrencyAbbrev.isEmpty() ? pEntry->GetBankSymbol() == OUString(aConfiguredCurrencyAbbrev) && pEntry->GetLanguage() == eConfiguredCurrencyLanguage : false) ) { @@ -3803,7 +3803,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() { rCurrencyTable.insert( rCurrencyTable.begin() + nCurrencyPos++, pEntry ); if ( !nSecondarySystemCurrencyPosition && - (aConfiguredCurrencyAbbrev.Len() ? + (!aConfiguredCurrencyAbbrev.isEmpty() ? pEntry->GetBankSymbol() == OUString(aConfiguredCurrencyAbbrev) : pEntry->GetLanguage() == eConfiguredCurrencyLanguage) ) { @@ -3823,7 +3823,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() { nSystemCurrencyPosition = nSecondarySystemCurrencyPosition; } - if ((aConfiguredCurrencyAbbrev.Len() && !nSystemCurrencyPosition) && + if ((!aConfiguredCurrencyAbbrev.isEmpty() && !nSystemCurrencyPosition) && LocaleDataWrapper::areChecksEnabled()) { LocaleDataWrapper::outputCheckMessage( @@ -3834,7 +3834,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() { nSystemCurrencyPosition = nMatchingSystemCurrencyPosition; } - if ((!aConfiguredCurrencyAbbrev.Len() && !nSystemCurrencyPosition) && + if ((aConfiguredCurrencyAbbrev.isEmpty() && !nSystemCurrencyPosition) && LocaleDataWrapper::areChecksEnabled()) { LocaleDataWrapper::outputCheckMessage( |