Kaydet (Commit) b2cd9dd3 authored tarafından Eike Rathke's avatar Eike Rathke

Resolves: tdf#114185 force KeywordLocalization::LocaleLegacy

... in GetPreviewStringGuess() that is used in Calc TEXT()
spreadsheet function, if the format code didn't resolve as English
or the format code needs to be (re)parsed otherwise as locale
dependent.

Also SvNumberFormatterServiceObj::convertNumberToPreviewString()
(XNumberFormatPreviewer::convertNumberToPreviewString()) if
bAllowEnglish==true.

Change-Id: I7c4b1a610d2bcb20fe0f0ae06efc81f998cae048
üst 482182fd
...@@ -1727,6 +1727,8 @@ bool SvNumberFormatter::GetPreviewStringGuess( const OUString& sFormatString, ...@@ -1727,6 +1727,8 @@ bool SvNumberFormatter::GetPreviewStringGuess( const OUString& sFormatString,
pEntry->GetFormatstring() ) ) pEntry->GetFormatstring() ) )
{ {
// other Format // other Format
// Force locale's keywords.
pFormatScanner->ChangeIntl( ImpSvNumberformatScan::KeywordLocalization::LocaleLegacy );
sTmpString = sFormatString; sTmpString = sFormatString;
pEntry.reset(new SvNumberformat( sTmpString, pFormatScanner, pEntry.reset(new SvNumberformat( sTmpString, pFormatScanner,
pStringScanner, nCheckPos, eLnge )); pStringScanner, nCheckPos, eLnge ));
...@@ -1747,6 +1749,8 @@ bool SvNumberFormatter::GetPreviewStringGuess( const OUString& sFormatString, ...@@ -1747,6 +1749,8 @@ bool SvNumberFormatter::GetPreviewStringGuess( const OUString& sFormatString,
pEntry2->GetFormatstring() ) ) pEntry2->GetFormatstring() ) )
{ {
// other Format // other Format
// Force locale's keywords.
pFormatScanner->ChangeIntl( ImpSvNumberformatScan::KeywordLocalization::LocaleLegacy );
sTmpString = sFormatString; sTmpString = sFormatString;
pEntry.reset(new SvNumberformat( sTmpString, pFormatScanner, pEntry.reset(new SvNumberformat( sTmpString, pFormatScanner,
pStringScanner, nCheckPos, eLnge )); pStringScanner, nCheckPos, eLnge ));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment