sc/source/core/tool/interpr3.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 2d40520a57c49d93097e11079713c073d35a9491 Author: Eike Rathke <er...@redhat.com> Date: Fri Oct 18 21:23:50 2013 +0200 removed senseless comments Change-Id: I38dcca9d513e9122ffca81f448ad3181fd7a9817 diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 3699a39..62568ee 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -3850,7 +3850,7 @@ void ScInterpreter::CalculatePearsonCovar( bool _bPearson, bool _bStexy, bool _b } } } - if (fCount < (_bStexy ? 3.0 : (_bSample ? 2.0 : 1.0))) // fCount==1 is handled by checking denominator later on + if (fCount < (_bStexy ? 3.0 : (_bSample ? 2.0 : 1.0))) PushNoValue(); else { @@ -3872,7 +3872,7 @@ void ScInterpreter::CalculatePearsonCovar( bool _bPearson, bool _bStexy, bool _b } } } - } // for (SCSIZE i = 0; i < nC1; i++) + } if ( _bPearson ) { if (fSumSqrDeltaX == 0.0 || ( !_bStexy && fSumSqrDeltaY == 0.0) ) @@ -3882,7 +3882,7 @@ void ScInterpreter::CalculatePearsonCovar( bool _bPearson, bool _bStexy, bool _b fSumDeltaXDeltaY / fSumSqrDeltaX) / (fCount-2))); else PushDouble( fSumDeltaXDeltaY / sqrt( fSumSqrDeltaX * fSumSqrDeltaY)); - } // if ( _bPearson ) + } else { if ( _bSample ) commit ac0dc48b63d93155304dfc44bd8f83adc4ae0825 Author: Eike Rathke <er...@redhat.com> Date: Fri Oct 18 21:21:14 2013 +0200 check fCount beforehand and bail out early, fdo#70000 related Change-Id: I47265cf0be9785e8be4b4be0b13d40cda206f349 diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index ee30c48..3699a39 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -3850,7 +3850,7 @@ void ScInterpreter::CalculatePearsonCovar( bool _bPearson, bool _bStexy, bool _b } } } - if (fCount < (_bStexy ? 3.0 : 1.0)) // fCount==1 is handled by checking denominator later on + if (fCount < (_bStexy ? 3.0 : (_bSample ? 2.0 : 1.0))) // fCount==1 is handled by checking denominator later on PushNoValue(); else { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits