diff options
author | Eike Rathke <erack@redhat.com> | 2014-06-13 14:16:11 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2014-06-13 14:43:13 +0200 |
commit | d83ab715a04c166ad0e8962b52c0800fb6f2969c (patch) | |
tree | 1f44c116b6c3dcc3f2a8411a6b4597e5fb017a90 | |
parent | 3453879aac287670db6f700ab98b2519912e9355 (diff) |
resolved fdo#79978 propagate error through DoubleArray of matrix
Regression introduced with 83f77ab0661df992f241e5f9ecb1aa8f8eaeafec.
Interpreter errors are transported using NaN coded doubles, using simple
setNan()/isNan() to flag and ignore non-numeric values skips all error
values.
Change-Id: I0d3cb30262bc5ba7ee77e53a2bc45e56569fbc4b
(cherry picked from commit a288bebbcec0b16e1ced09a601de5ffbb6b1bbe0)
-rw-r--r-- | include/formula/errorcodes.hxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/interpr1.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/interpr5.cxx | 16 | ||||
-rw-r--r-- | sc/source/core/tool/scmatrix.cxx | 10 |
4 files changed, 24 insertions, 8 deletions
diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx index cea578786014..a92372c6681d 100644 --- a/include/formula/errorcodes.hxx +++ b/include/formula/errorcodes.hxx @@ -74,6 +74,10 @@ const sal_uInt16 errNotNumericString = 534; // ScInterpreter internal: jump matrix already has a result at this position, // do not overwrite in case of empty code path. const sal_uInt16 errJumpMatHasResult = 535; +// ScInterpreter internal: (matrix) element is not a numeric value, i.e. +// string or empty, to be distinguished from the general errNoValue NAN and not +// to be used as result. +const sal_uInt16 errElementNaN = 536; // Interpreter: NA() not available condition, not a real error const sal_uInt16 NOTAVAILABLE = 0x7fff; diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 83393ca22fc2..8c86e56a7839 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -5613,7 +5613,7 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs eFunc ) continue; fVal = *itMain; - if (rtl::math::isNan(fVal)) + if (GetDoubleErrorValue(fVal) == errElementNaN) continue; ++fCount; diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 2205ed7d9320..32123634d857 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -1661,13 +1661,25 @@ namespace { class SumValues : std::unary_function<double, void> { double mfSum; + bool mbError; public: - SumValues() : mfSum(0.0) {} + SumValues() : mfSum(0.0), mbError(false) {} void operator() (double f) { - if (!rtl::math::isNan(f)) + if (mbError) + return; + + sal_uInt16 nErr = GetDoubleErrorValue(f); + if (!nErr) mfSum += f; + else if (nErr != errElementNaN) + { + // Propagate the first error encountered, ignore "this is not a + // number" elements. + mfSum = f; + mbError = true; + } } double getValue() const { return mfSum; } diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 8b3cc2581029..18aeb5d5b016 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -1511,7 +1511,7 @@ public: ToDoubleArray( size_t nSize, bool bEmptyAsZero ) : maArray(nSize, 0.0), miPos(maArray.begin()), mbEmptyAsZero(bEmptyAsZero) { - rtl::math::setNan(&mfNaN); + mfNaN = CreateDoubleError( errElementNaN); } void operator() (const MatrixImplType::element_block_node_type& node) @@ -1582,7 +1582,7 @@ class MergeDoubleArrayFunc : std::unary_function<MatrixImplType::element_block_t public: MergeDoubleArrayFunc(std::vector<double>& rArray) : mrArray(rArray), miPos(mrArray.begin()) { - rtl::math::setNan(&mfNaN); + mfNaN = CreateDoubleError( errElementNaN); } void operator() (const MatrixImplType::element_block_node_type& node) @@ -1598,7 +1598,7 @@ public: numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data); for (; it != itEnd; ++it, ++miPos) { - if (rtl::math::isNan(*miPos)) + if (GetDoubleErrorValue(*miPos) == errElementNaN) continue; *miPos = op(*miPos, *it); @@ -1611,7 +1611,7 @@ public: boolean_element_block::const_iterator itEnd = boolean_element_block::end(*node.data); for (; it != itEnd; ++it, ++miPos) { - if (rtl::math::isNan(*miPos)) + if (GetDoubleErrorValue(*miPos) == errElementNaN) continue; *miPos = op(*miPos, *it ? 1.0 : 0.0); @@ -1629,7 +1629,7 @@ public: // Empty element is equivalent of having a numeric value of 0.0. for (size_t i = 0; i < node.size; ++i, ++miPos) { - if (rtl::math::isNan(*miPos)) + if (GetDoubleErrorValue(*miPos) == errElementNaN) continue; *miPos = op(*miPos, 0.0); |