From 90df301f6d4e7ab0b660d9e39c6fe639ef5ae348 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 3 May 2018 14:59:33 +0200 Subject: Use the currently active locale if no format passed No format passed doesn't necessarily mean the init/system locale, use the locale set at SvNumberFormatter::IsNumberFormat() Change-Id: Ief1025fa14145396ba096842e2f3341496ce4ce8 Reviewed-on: https://gerrit.libreoffice.org/53829 Tested-by: Jenkins Reviewed-by: Eike Rathke --- svl/source/numbers/zforfind.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'svl') diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index e55786ea9d17..be310b5cf390 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -709,8 +709,9 @@ bool ImpSvNumberInputScan::GetCurrency( const OUString& rString, sal_Int32& nPos if ( rString.getLength() > nPos ) { if ( !aUpperCurrSymbol.getLength() ) - { // if no format specified the currency of the initialized formatter - LanguageType eLang = (mpFormat ? mpFormat->GetLanguage() : pFormatter->GetLanguage()); + { // If no format specified the currency of the currently active locale. + LanguageType eLang = (mpFormat ? mpFormat->GetLanguage() : + pFormatter->GetLocaleData()->getLanguageTag().getLanguageType()); aUpperCurrSymbol = pFormatter->GetCharClass()->uppercase( SvNumberFormatter::GetCurrencyEntry( eLang ).GetSymbol() ); } -- cgit v1.2.3