commit d658c092f488fc0d4cb924fe3e34cab997db76e2
author Kohei Yoshida <kohei.yoshida@collabora.com> Fri Mar 07 18:03:24 2014 -0500
committer Kohei Yoshida <kohei.yoshida@collabora.com> Fri Mar 07 18:05:07 2014 -0500
tree cbc835d0702a0a1ee0e975d7588ec060b53e0bad
parent 78e6b7a94265507e43dd80182706970f49cdb303

fdo#75628: SUM should inherit error if one is present in its references.

Change-Id: I94017fe91295dbb929f57be5e3fb26edf5032a8f

sc/source/core/tool/interpr6.cxx

diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index a32b3c1..b98fb9b 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -210,8 +210,10 @@ namespace {
class NumericCellAccumulator
{
    double mfSum;
    sal_uInt16 mnError;

public:
    NumericCellAccumulator() : mfSum(0.0) {}
    NumericCellAccumulator() : mfSum(0.0), mnError(0) {}

    void operator() (size_t, double fVal)
    {
@@ -220,11 +222,28 @@ public:

    void operator() (size_t, const ScFormulaCell* pCell)
    {
        if (mnError)
            // Skip all the rest if we have an error.
            return;

        double fVal = 0.0;
        sal_uInt16 nErr = 0;
        ScFormulaCell& rCell = const_cast<ScFormulaCell&>(*pCell);
        if (rCell.IsValue())
            mfSum += rCell.GetValue();
        if (!rCell.GetErrorOrValue(nErr, fVal))
            // The cell has neither error nor value.  Perhaps string result.
            return;

        if (nErr)
        {
            // Cell has error.
            mnError = nErr;
            return;
        }

        mfSum += fVal;
    }

    sal_uInt16 getError() const { return mnError; }
    double getSum() const { return mfSum; }
};

@@ -299,10 +318,11 @@ class FuncSum : public sc::ColumnSpanSet::ColumnAction
    sc::ColumnBlockConstPosition maPos;
    ScColumn* mpCol;
    double mfSum;
    sal_uInt16 mnError;
    sal_uInt32 mnNumFmt;

public:
    FuncSum() : mpCol(0), mfSum(0.0), mnNumFmt(0) {}
    FuncSum() : mpCol(0), mfSum(0.0), mnError(0), mnNumFmt(0) {}

    virtual void startColumn(ScColumn* pCol)
    {
@@ -315,12 +335,20 @@ public:
        if (!bVal)
            return;

        if (mnError)
            return;

        NumericCellAccumulator aFunc;
        maPos.miCellPos = sc::ParseFormulaNumeric(maPos.miCellPos, mpCol->GetCellStore(), nRow1, nRow2, aFunc);
        mnError = aFunc.getError();
        if (mnError)
            return;

        mfSum += aFunc.getSum();
        mnNumFmt = mpCol->GetNumberFormat(nRow2);
    };

    sal_uInt16 getError() const { return mnError; }
    double getSum() const { return mfSum; }
    sal_uInt32 getNumberFormat() const { return mnNumFmt; }
};
@@ -806,6 +834,12 @@ void ScInterpreter::ScSum()

                FuncSum aAction;
                aSet.executeColumnAction(*pDok, aAction);
                sal_uInt16 nErr = aAction.getError();
                if (nErr)
                {
                    SetError(nErr);
                    return;
                }
                fRes += aAction.getSum();

                // Get the number format of the last iterated cell.