Kaydet (Commit) d679ac0d authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar

ofz#5535 max decimal places for rtl_math_round is 20

Change-Id: I636e086c51ceb70bdac72acfbabe99ad29003cdb
Reviewed-on: https://gerrit.libreoffice.org/48268Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/48303Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
(cherry picked from commit 7a59ef66)
üst 88c8013c
...@@ -39,6 +39,8 @@ using namespace svt; ...@@ -39,6 +39,8 @@ using namespace svt;
const sal_Unicode cNoBreakSpace = 0xA0; const sal_Unicode cNoBreakSpace = 0xA0;
const sal_Unicode cNarrowNoBreakSpace = 0x202F; const sal_Unicode cNarrowNoBreakSpace = 0x202F;
const int MaxCntPost = 20; //max dec places allow by rtl_math_round
ImpSvNumberformatScan::ImpSvNumberformatScan( SvNumberFormatter* pFormatterP ) ImpSvNumberformatScan::ImpSvNumberformatScan( SvNumberFormatter* pFormatterP )
: eNewLnge(LANGUAGE_DONTKNOW) : eNewLnge(LANGUAGE_DONTKNOW)
, eTmpLnge(LANGUAGE_DONTKNOW) , eTmpLnge(LANGUAGE_DONTKNOW)
...@@ -2493,7 +2495,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) ...@@ -2493,7 +2495,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
switch( sStrArray[i][0] ) switch( sStrArray[i][0] )
{ {
case '0': case '0':
if ( bTimePart && Is100SecZero( i, bDecSep ) ) if (bTimePart && Is100SecZero(i, bDecSep) && nCounter < MaxCntPost)
{ {
bDecSep = true; bDecSep = true;
nTypeArray[i] = NF_SYMBOLTYPE_DIGIT; nTypeArray[i] = NF_SYMBOLTYPE_DIGIT;
...@@ -2501,7 +2503,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) ...@@ -2501,7 +2503,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
nCounter++; nCounter++;
i++; i++;
while (i < nAnzStrings && while (i < nAnzStrings &&
sStrArray[i][0] == '0') sStrArray[i][0] == '0' && nCounter < MaxCntPost)
{ {
rStr += sStrArray[i]; rStr += sStrArray[i];
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
......
<table><td SDVALSDNUM=;0;MrS)000000000000000000000000000000000000;>
\ No newline at end of file
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