svl/source/numbers/zforscan.cxx | 6 ++++-- sw/qa/core/data/html/pass/ofz5535-1.html | 1 + 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 732f8662365035226677921e98a327bad8620e58 Author: Caolán McNamara <[email protected]> Date: Sun Jan 21 15:24:13 2018 +0000 ofz#5535 max decimal places for rtl_math_round is 20 Change-Id: I636e086c51ceb70bdac72acfbabe99ad29003cdb Reviewed-on: https://gerrit.libreoffice.org/48268 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/48299 Reviewed-by: Eike Rathke <[email protected]> diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index d29ecddb1d16..3687ebc4756b 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -39,6 +39,8 @@ using namespace svt; const sal_Unicode cNoBreakSpace = 0xA0; const sal_Unicode cNarrowNoBreakSpace = 0x202F; +const int MaxCntPost = 20; //max dec places allow by rtl_math_round + const ::std::vector<OUString> ImpSvNumberformatScan::sEnglishKeyword = { // Syntax keywords in English (USA) //! All keywords MUST be UPPERCASE! In same order as NfKeywordTable @@ -2735,7 +2737,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) switch( sStrArray[i][0] ) { case '0': - if ( bTimePart && Is100SecZero( i, bDecSep ) ) + if (bTimePart && Is100SecZero(i, bDecSep) && nCounter < MaxCntPost) { bDecSep = true; nTypeArray[i] = NF_SYMBOLTYPE_DIGIT; @@ -2743,7 +2745,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) nCounter++; i++; while (i < nStringsCnt && - sStrArray[i][0] == '0') + sStrArray[i][0] == '0' && nCounter < MaxCntPost) { rStr += sStrArray[i]; nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; diff --git a/sw/qa/core/data/html/pass/ofz5535-1.html b/sw/qa/core/data/html/pass/ofz5535-1.html new file mode 100644 index 000000000000..5439e009b392 --- /dev/null +++ b/sw/qa/core/data/html/pass/ofz5535-1.html @@ -0,0 +1 @@ +<table><td SDVALSDNUM=;0;MrS)000000000000000000000000000000000000;> \ No newline at end of file _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
