diff options
17 files changed, 49 insertions, 63 deletions
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx index e6f09f18030e..a296927635bf 100644 --- a/sal/rtl/math.cxx +++ b/sal/rtl/math.cxx @@ -1133,6 +1133,9 @@ double SAL_CALL rtl_math_round(double fValue, int nDecPlaces, { OSL_ASSERT(nDecPlaces >= -20 && nDecPlaces <= 20); + if (!std::isfinite(fValue)) + return fValue; + if (fValue == 0.0) return fValue; @@ -1190,24 +1193,7 @@ double SAL_CALL rtl_math_round(double fValue, int nDecPlaces, switch ( eMode ) { case rtl_math_RoundingMode_Corrected : - { - int nExp; // exponent for correction - if ( fValue > 0.0 ) - nExp = static_cast<int>( floor( log10( fValue ) ) ); - else - nExp = 0; - - int nIndex; - - if (nExp < 0) - nIndex = 15; - else if (nExp >= 14) - nIndex = 0; - else - nIndex = 15 - nExp; - - fValue = floor(fValue + 0.5 + nCorrVal[nIndex]); - } + fValue = rtl::math::approxFloor(fValue + 0.5); break; case rtl_math_RoundingMode_Down: fValue = rtl::math::approxFloor(fValue); @@ -1321,7 +1307,7 @@ double SAL_CALL rtl_math_approxValue( double fValue ) SAL_THROW_EXTERN_C() if (!std::isfinite(fValue)) return fOrigValue; - fValue = rtl_math_round(fValue, 0, rtl_math_RoundingMode_Corrected); + fValue = std::round(fValue); fValue /= fExpValue; // If the original value was near DBL_MAX we got an overflow. Restore and diff --git a/sc/qa/unit/data/functions/addin/fods/convert.fods b/sc/qa/unit/data/functions/addin/fods/convert.fods index 12ba09dcd326..64eb2db5ff82 100644 --- a/sc/qa/unit/data/functions/addin/fods/convert.fods +++ b/sc/qa/unit/data/functions/addin/fods/convert.fods @@ -3409,7 +3409,7 @@ <table:table-cell office:value-type="float" office:value="14.2857127610345" calcext:value-type="float"> <text:p>14.2857127610345</text:p> </table:table-cell> - <table:table-cell table:style-name="ce60" table:formula="of:=ROUND([.A44];12)=ROUND([.B44];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce60" table:formula="of:=ROUND([.A44];11)=ROUND([.B44];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce14" table:formula="of:=FORMULA([.A44])" office:value-type="string" office:string-value="=CONVERT(10000000,H48,H49)" calcext:value-type="string"> @@ -4425,7 +4425,7 @@ <table:table-cell office:value-type="float" office:value="11.1445349270435" calcext:value-type="float"> <text:p>11.1445349270435</text:p> </table:table-cell> - <table:table-cell table:style-name="ce60" table:formula="of:=ROUND([.A86];12)=ROUND([.B86];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce60" table:formula="of:=ROUND([.A86];11)=ROUND([.B86];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce14" table:formula="of:=FORMULA([.A86])" office:value-type="string" office:string-value="=CONVERT(100000000000000,H93,H94)" calcext:value-type="string"> @@ -5867,4 +5867,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/financial/fods/nper.fods b/sc/qa/unit/data/functions/financial/fods/nper.fods index 2eac9b8f339f..83dc438afa34 100644 --- a/sc/qa/unit/data/functions/financial/fods/nper.fods +++ b/sc/qa/unit/data/functions/financial/fods/nper.fods @@ -1293,7 +1293,7 @@ <table:table-cell office:value-type="float" office:value="-12.0207780851555" calcext:value-type="float"> <text:p>-12.0207780851555</text:p> </table:table-cell> - <table:table-cell table:style-name="ce24" table:formula="of:=ROUND([.A2];12)=ROUND([.B2];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce24" table:formula="of:=ROUND([.A2];11)=ROUND([.B2];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce31" table:formula="of:=FORMULA([.A2])" office:value-type="string" office:string-value="=NPER(0.06,153.75,2600)" calcext:value-type="string"> diff --git a/sc/qa/unit/data/functions/fods/gammaln.precise.fods b/sc/qa/unit/data/functions/fods/gammaln.precise.fods index 082f59f6af7a..fec21d9ceaee 100644 --- a/sc/qa/unit/data/functions/fods/gammaln.precise.fods +++ b/sc/qa/unit/data/functions/fods/gammaln.precise.fods @@ -4109,7 +4109,7 @@ <table:table-cell office:value-type="float" office:value="12.8018274800815" calcext:value-type="float"> <text:p>12.8018274800815</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A21];12)=ROUND([.B21];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A21];11)=ROUND([.B21];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce21" table:formula="of:=FORMULA([.A21])" office:value-type="string" office:string-value="=GAMMALN.PRECISE(I20)" calcext:value-type="string"> @@ -5093,4 +5093,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/mathematical/fods/convert_add.fods b/sc/qa/unit/data/functions/mathematical/fods/convert_add.fods index a6f3cec90e5b..ef5e269fce26 100644 --- a/sc/qa/unit/data/functions/mathematical/fods/convert_add.fods +++ b/sc/qa/unit/data/functions/mathematical/fods/convert_add.fods @@ -3354,7 +3354,7 @@ <table:table-cell office:value-type="float" office:value="14.2857127610345" calcext:value-type="float"> <text:p>14.2857127610345</text:p> </table:table-cell> - <table:table-cell table:style-name="ce18" table:formula="of:=ROUND([.A44];12)=ROUND([.B44];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce18" table:formula="of:=ROUND([.A44];11)=ROUND([.B44];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce14" table:formula="of:=FORMULA([.A44])" office:value-type="string" office:string-value="=CONVERT_ADD(10000000,H48,H49)" calcext:value-type="string"> @@ -4370,7 +4370,7 @@ <table:table-cell office:value-type="float" office:value="11.1445349270435" calcext:value-type="float"> <text:p>11.1445349270435</text:p> </table:table-cell> - <table:table-cell table:style-name="ce18" table:formula="of:=ROUND([.A86];12)=ROUND([.B86];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce18" table:formula="of:=ROUND([.A86];11)=ROUND([.B86];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce14" table:formula="of:=FORMULA([.A86])" office:value-type="string" office:string-value="=CONVERT_ADD(100000000000000,H93,H94)" calcext:value-type="string"> @@ -5812,4 +5812,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/statistical/fods/chisq.inv.fods b/sc/qa/unit/data/functions/statistical/fods/chisq.inv.fods index 84f03ae0c1cf..b3d6368b9819 100644 --- a/sc/qa/unit/data/functions/statistical/fods/chisq.inv.fods +++ b/sc/qa/unit/data/functions/statistical/fods/chisq.inv.fods @@ -4443,7 +4443,7 @@ <table:table-cell office:value-type="float" office:value="14.2040730851385" calcext:value-type="float"> <text:p>14.2040730851385</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:formula="of:=ROUND([.A14];12)=ROUND([.B14];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce28" table:formula="of:=ROUND([.A14];11)=ROUND([.B14];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A14])" office:value-type="string" office:string-value="{=CHISQ.INV(F1:F11,G1:G11)}" calcext:value-type="string"> @@ -4796,7 +4796,7 @@ <table:table-cell office:value-type="float" office:value="15.2911628705065" calcext:value-type="float"> <text:p>15.2911628705065</text:p> </table:table-cell> - <table:table-cell table:style-name="ce48" table:formula="of:=ROUND([.A27];12)=ROUND([.B27];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce48" table:formula="of:=ROUND([.A27];11)=ROUND([.B27];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A27])" office:value-type="string" office:string-value="{=CHISQ.INV(T2:T14,U2:U14)}" calcext:value-type="string"> @@ -4822,7 +4822,7 @@ <table:table-cell office:value-type="float" office:value="20.4461298047275" calcext:value-type="float"> <text:p>20.4461298047275</text:p> </table:table-cell> - <table:table-cell table:style-name="ce48" table:formula="of:=ROUND([.A28];12)=ROUND([.B28];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce48" table:formula="of:=ROUND([.A28];11)=ROUND([.B28];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A28])" office:value-type="string" office:string-value="{=CHISQ.INV(T2:T14,U2:U14)}" calcext:value-type="string"> @@ -4926,7 +4926,7 @@ <table:table-cell office:value-type="float" office:value="15.6557151216055" calcext:value-type="float"> <text:p>15.6557151216055</text:p> </table:table-cell> - <table:table-cell table:style-name="ce48" table:formula="of:=ROUND([.A32];12)=ROUND([.B32];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce48" table:formula="of:=ROUND([.A32];11)=ROUND([.B32];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A32])" office:value-type="string" office:string-value="{=CHISQ.INV(T2:T14,U2:U14)}" calcext:value-type="string"> @@ -5373,7 +5373,7 @@ <table:table-cell office:value-type="float" office:value="5.8218731997855" calcext:value-type="float"> <text:p>5.8218731997855</text:p> </table:table-cell> - <table:table-cell table:style-name="ce48" table:formula="of:=ROUND([.A49];12)=ROUND([.B49];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce48" table:formula="of:=ROUND([.A49];11)=ROUND([.B49];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A49])" office:value-type="string" office:string-value="{=CHISQ.INV(F1:F11,I1:I11)}" calcext:value-type="string"> @@ -5835,4 +5835,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/statistical/fods/forecast.ets.mult.fods b/sc/qa/unit/data/functions/statistical/fods/forecast.ets.mult.fods index 9741ba7dc9a2..0c45eb46cd8c 100644 --- a/sc/qa/unit/data/functions/statistical/fods/forecast.ets.mult.fods +++ b/sc/qa/unit/data/functions/statistical/fods/forecast.ets.mult.fods @@ -9953,7 +9953,7 @@ <table:table-cell office:value-type="float" office:value="87.6933650074125" calcext:value-type="float"> <text:p>87.6933650074125</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A120];12)=ROUND([.B120];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A120];11)=ROUND([.B120];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce18" table:formula="of:=FORMULA([.A120])" office:value-type="string" office:string-value="{=FORECAST.ETS.MULT(AJ64:AJ100,AI5:AI64,AJ5:AJ64,12,1,1)}" calcext:value-type="string"> @@ -9991,7 +9991,7 @@ <table:table-cell office:value-type="float" office:value="99.6314373472625" calcext:value-type="float"> <text:p>99.6314373472625</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A122];12)=ROUND([.B122];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A122];11)=ROUND([.B122];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce18" table:formula="of:=FORMULA([.A122])" office:value-type="string" office:string-value="{=FORECAST.ETS.MULT(AJ64:AJ100,AI5:AI64,AJ5:AJ64,12,1,1)}" calcext:value-type="string"> @@ -10536,7 +10536,7 @@ <table:table-cell office:value-type="float" office:value="69.5445898754795" calcext:value-type="float"> <text:p>69.5445898754795</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A151];12)=ROUND([.B151];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A151];11)=ROUND([.B151];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce18" table:formula="of:=FORMULA([.A151])" office:value-type="string" office:string-value="{=FORECAST.ETS.MULT(AJ64:AJ100,AI5:AI64,AJ5:AJ64,12,1,1)}" calcext:value-type="string"> @@ -11658,7 +11658,7 @@ <table:table-cell table:style-name="ce14" office:value-type="float" office:value="87.6933650074125" calcext:value-type="float"> <text:p>87.693365</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A217];12)=ROUND([.B217];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A217];11)=ROUND([.B217];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce18" table:formula="of:=FORMULA([.A217])" office:value-type="string" office:string-value="{=FORECAST.ETS.MULT($BI$64:$BI100,$BH$5:$BH$64,$BI$5:$BI$64,12,1,1)}" calcext:value-type="string"> @@ -11692,7 +11692,7 @@ <table:table-cell table:style-name="ce14" office:value-type="float" office:value="99.6314373472625" calcext:value-type="float"> <text:p>99.631437</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A219];12)=ROUND([.B219];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A219];11)=ROUND([.B219];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce18" table:formula="of:=FORMULA([.A219])" office:value-type="string" office:string-value="{=FORECAST.ETS.MULT($BI$64:$BI100,$BH$5:$BH$64,$BI$5:$BI$64,12,1,1)}" calcext:value-type="string"> @@ -12185,7 +12185,7 @@ <table:table-cell office:value-type="float" office:value="69.5445898754795" calcext:value-type="float"> <text:p>69.5445898754795</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A248];12)=ROUND([.B248];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A248];11)=ROUND([.B248];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce18" table:formula="of:=FORMULA([.A248])" office:value-type="string" office:string-value="{=FORECAST.ETS.MULT($BI$64:$BI100,$BH$5:$BH$64,$BI$5:$BI$64,12,1,1)}" calcext:value-type="string"> @@ -12336,4 +12336,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/statistical/fods/gammaln.fods b/sc/qa/unit/data/functions/statistical/fods/gammaln.fods index 61b0a44eec41..66f1f473482b 100644 --- a/sc/qa/unit/data/functions/statistical/fods/gammaln.fods +++ b/sc/qa/unit/data/functions/statistical/fods/gammaln.fods @@ -4067,7 +4067,7 @@ <table:table-cell office:value-type="float" office:value="12.8018274800815" calcext:value-type="float"> <text:p>12.8018274800815</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A21];12)=ROUND([.B21];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A21];11)=ROUND([.B21];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce21" table:formula="of:=FORMULA([.A21])" office:value-type="string" office:string-value="=GAMMALN(I20)" calcext:value-type="string"> @@ -5051,4 +5051,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/statistical/fods/gammaln.precise.fods b/sc/qa/unit/data/functions/statistical/fods/gammaln.precise.fods index 92ffe8e3e763..89365b2ab887 100644 --- a/sc/qa/unit/data/functions/statistical/fods/gammaln.precise.fods +++ b/sc/qa/unit/data/functions/statistical/fods/gammaln.precise.fods @@ -4201,7 +4201,7 @@ <table:table-cell office:value-type="float" office:value="12.8018274800815" calcext:value-type="float"> <text:p>12.8018274800815</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A21];12)=ROUND([.B21];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A21];11)=ROUND([.B21];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce21" table:formula="of:=FORMULA([.A21])" office:value-type="string" office:string-value="=GAMMALN.PRECISE(I20)" calcext:value-type="string"> @@ -5185,4 +5185,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/statistical/fods/geomean.fods b/sc/qa/unit/data/functions/statistical/fods/geomean.fods index 2a8fdf3fdf1e..b04e2464628e 100644 --- a/sc/qa/unit/data/functions/statistical/fods/geomean.fods +++ b/sc/qa/unit/data/functions/statistical/fods/geomean.fods @@ -4109,7 +4109,7 @@ <table:table-cell office:value-type="float" office:value="10.4400868170485" calcext:value-type="float"> <text:p>10.4400868170485</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A20];12)=ROUND([.B20];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A20];11)=ROUND([.B20];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce21" table:formula="of:=FORMULA([.A20])" office:value-type="string" office:string-value="=GEOMEAN(I19:I22)" calcext:value-type="string"> diff --git a/sc/qa/unit/data/functions/statistical/fods/harmean.fods b/sc/qa/unit/data/functions/statistical/fods/harmean.fods index 01023adf9b7f..d1cc626ea92d 100644 --- a/sc/qa/unit/data/functions/statistical/fods/harmean.fods +++ b/sc/qa/unit/data/functions/statistical/fods/harmean.fods @@ -4298,7 +4298,7 @@ <table:table-cell office:value-type="float" office:value="17.4283840749415" calcext:value-type="float"> <text:p>17.4283840749415</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A27];12)=ROUND([.B27];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A27];11)=ROUND([.B27];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce21" table:formula="of:=FORMULA([.A27])" office:value-type="string" office:string-value="=HARMEAN(I26:I29)" calcext:value-type="string"> @@ -4352,7 +4352,7 @@ <table:table-cell office:value-type="float" office:value="18.4864864864865" calcext:value-type="float"> <text:p>18.4864864864865</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A29];12)=ROUND([.B29];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A29];11)=ROUND([.B29];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce21" table:formula="of:=FORMULA([.A29])" office:value-type="string" office:string-value="=HARMEAN(I28:I31)" calcext:value-type="string"> @@ -5189,4 +5189,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/statistical/fods/lognorm.inv.fods b/sc/qa/unit/data/functions/statistical/fods/lognorm.inv.fods index c37347291963..df8095b670b5 100644 --- a/sc/qa/unit/data/functions/statistical/fods/lognorm.inv.fods +++ b/sc/qa/unit/data/functions/statistical/fods/lognorm.inv.fods @@ -3937,7 +3937,7 @@ <table:table-cell table:style-name="ce15" office:value-type="float" office:value="98.1601932437975" calcext:value-type="float"> <text:p>98.1601932437975000000</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A8];12)=ROUND([.B8];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A8];11)=ROUND([.B8];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce22" table:formula="of:=FORMULA([.A8])" office:value-type="string" office:string-value="{=LOGNORM.INV(K1:K8,L1:L8,M1:M8)}" calcext:value-type="string"> @@ -5044,4 +5044,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/statistical/fods/stdev.fods b/sc/qa/unit/data/functions/statistical/fods/stdev.fods index a55bf203c1ea..315307de78c1 100644 --- a/sc/qa/unit/data/functions/statistical/fods/stdev.fods +++ b/sc/qa/unit/data/functions/statistical/fods/stdev.fods @@ -4266,7 +4266,7 @@ <table:table-cell table:style-name="ce19" office:value-type="float" office:value="27.4639157198435" calcext:value-type="float"> <text:p>27.4639157198435</text:p> </table:table-cell> - <table:table-cell table:style-name="ce41" table:formula="of:=ROUND([.A10];12)=ROUND([.B10];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce41" table:formula="of:=ROUND([.A10];11)=ROUND([.B10];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=STDEV(P3:P12)" calcext:value-type="string"> @@ -6722,4 +6722,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/statistical/fods/stdev.p.fods b/sc/qa/unit/data/functions/statistical/fods/stdev.p.fods index 42d12467fb4f..2de9f7bfaeb7 100644 --- a/sc/qa/unit/data/functions/statistical/fods/stdev.p.fods +++ b/sc/qa/unit/data/functions/statistical/fods/stdev.p.fods @@ -4266,7 +4266,7 @@ <table:table-cell table:style-name="ce19" office:value-type="float" office:value="26.0545581424825" calcext:value-type="float"> <text:p>26.0545581424825</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=ROUND([.A10];12)=ROUND([.B10];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce25" table:formula="of:=ROUND([.A10];11)=ROUND([.B10];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=STDEV.P(P3:P12)" calcext:value-type="string"> @@ -4360,7 +4360,7 @@ <table:table-cell office:value-type="float" office:value="14.6711451495785" calcext:value-type="float"> <text:p>14.6711451495785</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:formula="of:=ROUND([.A12];12)=ROUND([.B12];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce28" table:formula="of:=ROUND([.A12];11)=ROUND([.B12];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A12])" office:value-type="string" office:string-value="=STDEV.P(34.5, 2, 8.9, -4)" calcext:value-type="string"> @@ -6731,4 +6731,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/statistical/fods/stdev.s.fods b/sc/qa/unit/data/functions/statistical/fods/stdev.s.fods index a880adbac276..802bd1720ea6 100644 --- a/sc/qa/unit/data/functions/statistical/fods/stdev.s.fods +++ b/sc/qa/unit/data/functions/statistical/fods/stdev.s.fods @@ -4266,7 +4266,7 @@ <table:table-cell table:style-name="ce19" office:value-type="float" office:value="27.4639157198435" calcext:value-type="float"> <text:p>27.4639157198435</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=ROUND([.A10];12)=ROUND([.B10];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce25" table:formula="of:=ROUND([.A10];11)=ROUND([.B10];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=STDEV.S(P3:P12)" calcext:value-type="string"> @@ -6731,4 +6731,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/statistical/fods/stdeva.fods b/sc/qa/unit/data/functions/statistical/fods/stdeva.fods index 6c9739ac7bd3..51c81231aa0a 100644 --- a/sc/qa/unit/data/functions/statistical/fods/stdeva.fods +++ b/sc/qa/unit/data/functions/statistical/fods/stdeva.fods @@ -4267,7 +4267,7 @@ <table:table-cell table:style-name="ce19" office:value-type="float" office:value="27.4639157198435" calcext:value-type="float"> <text:p>27.4639157198435</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=ROUND([.A10];12)=ROUND([.B10];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce25" table:formula="of:=ROUND([.A10];11)=ROUND([.B10];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=STDEVA(P3:P12)" calcext:value-type="string"> @@ -6745,4 +6745,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/functions/statistical/fods/stdevp.fods b/sc/qa/unit/data/functions/statistical/fods/stdevp.fods index ed72ca8d1b42..09d05409e306 100644 --- a/sc/qa/unit/data/functions/statistical/fods/stdevp.fods +++ b/sc/qa/unit/data/functions/statistical/fods/stdevp.fods @@ -4223,7 +4223,7 @@ <table:table-cell table:style-name="ce19" office:value-type="float" office:value="26.0545581424825" calcext:value-type="float"> <text:p>26.0545581424825</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=ROUND([.A10];12)=ROUND([.B10];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce25" table:formula="of:=ROUND([.A10];11)=ROUND([.B10];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=STDEVP(P3:P12)" calcext:value-type="string"> @@ -4317,7 +4317,7 @@ <table:table-cell office:value-type="float" office:value="14.6711451495785" calcext:value-type="float"> <text:p>14.6711451495785</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:formula="of:=ROUND([.A12];12)=ROUND([.B12];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce28" table:formula="of:=ROUND([.A12];11)=ROUND([.B12];11)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce32" table:formula="of:=FORMULA([.A12])" office:value-type="string" office:string-value="=STDEVP(34.5, 2, 8.9, -4)" calcext:value-type="string"> @@ -6701,4 +6701,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document>
\ No newline at end of file +</office:document> |