diff options
Diffstat (limited to 'sc/source/core/data')
| -rw-r--r-- | sc/source/core/data/column2.cxx | 12 | ||||
| -rw-r--r-- | sc/source/core/data/documen4.cxx | 6 | ||||
| -rw-r--r-- | sc/source/core/data/table3.cxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 3aabfec3f611..f9b4569d5c4e 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -3378,10 +3378,10 @@ class UpdateSubTotalHandler void update(double fVal, bool bVal) { - if (mrData.bError) + if (mrData.getError()) return; - switch (mrData.eFunc) + switch (mrData.getFunc()) { case SUBTOTAL_FUNC_CNT2: // everything mrData.update( fVal); @@ -3414,13 +3414,13 @@ public: { double fVal = 0.0; bool bVal = false; - if (mrData.eFunc != SUBTOTAL_FUNC_CNT2) // it doesn't interest us + if (mrData.getFunc() != SUBTOTAL_FUNC_CNT2) // it doesn't interest us { if (pCell->GetErrCode() != FormulaError::NONE) { - if (mrData.eFunc != SUBTOTAL_FUNC_CNT) // simply remove from count - mrData.bError = true; + if (mrData.getFunc() != SUBTOTAL_FUNC_CNT) // simply remove from count + mrData.setError(); } else if (pCell->IsValue()) { @@ -3466,7 +3466,7 @@ void ScColumn::UpdateSelectionFunction( sc::SingleColumnSpanSet::SpansType::const_iterator it = aSpans.begin(), itEnd = aSpans.end(); - switch (rData.eFunc) + switch (rData.getFunc()) { case SUBTOTAL_FUNC_SELECTION_COUNT: { diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 040f5e6b5dc0..f02e43f0bffc 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -610,15 +610,15 @@ bool ScDocument::GetSelectionFunction( ScSubTotalFunc eFunc, SCTAB nMax = static_cast<SCTAB>(maTabs.size()); ScMarkData::const_iterator itr = aMark.begin(), itrEnd = aMark.end(); - for (; itr != itrEnd && *itr < nMax && !aData.bError; ++itr) + for (; itr != itrEnd && *itr < nMax && !aData.getError(); ++itr) if (maTabs[*itr]) maTabs[*itr]->UpdateSelectionFunction(aData, aMark); rResult = aData.getResult(); - if (aData.bError) + if (aData.getError()) rResult = 0.0; - return !aData.bError; + return !aData.getError(); } double ScDocument::RoundValueAsShown( double fVal, sal_uInt32 nFormat, const ScInterpreterContext* pContext ) const diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 7ffd5dfec926..5a2550ce0ead 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -3595,7 +3595,7 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData, const ScMarkData& } const SCCOL nStartCol = aMarkArea.aStart.Col(); const SCCOL nEndCol = aMarkArea.aEnd.Col(); - for (SCCOL nCol = nStartCol; nCol <= nEndCol && !rData.bError; ++nCol) + for (SCCOL nCol = nStartCol; nCol <= nEndCol && !rData.getError(); ++nCol) { if (mpColFlags && ColHidden(nCol)) continue; |