diff options
| author | Eike Rathke <erack@redhat.com> | 2018-06-14 15:00:14 +0200 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2018-06-14 23:10:43 +0200 |
| commit | 32bcda269b07a88cecbb5a2fde10d4b4d7ce7538 (patch) | |
| tree | 60283ed347db6a3e6ebc9ab755446f70334ad32b | |
| parent | 0503090e47ffe5d09a26ee7a20134decf7ae1328 (diff) | |
Resolves: tdf#118161 use ScCellIterator::isEmpty() for COUNTA()
... instead of hasEmptyData() that considers inherited svEmptyCell
as well.
Effectively a regression from
commit 0e9e3be6f51436c1e5bf1481a434a85e334c09ea
CommitDate: Tue Mar 26 01:41:17 2013 -0400
More on ScCellIterator usage migration.
that started to include mpCurFormula->IsEmpty() in
ScCellIterator::isEmpty() which later was renamed to
ScCellIterator::hasEmptyData() and isEmpty() introduced for real
empty.
Change-Id: Iec97d58080016c28bc9a7e47d056e4d301263928
(cherry picked from commit cfe2e4eb835c06b24adabd60c7a3fddbd3f4dbc9)
Reviewed-on: https://gerrit.libreoffice.org/55804
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
| -rw-r--r-- | sc/source/core/tool/interpr6.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index 449375638cb5..c93511e23444 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -809,7 +809,7 @@ void ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero ) ScCellIterator aIter( pDok, aRange, mnSubTotalFlags ); for (bool bHas = aIter.first(); bHas; bHas = aIter.next()) { - if ( !aIter.hasEmptyData() ) + if ( !aIter.isEmpty() ) { ++nCount; } |