diff options
| author | Eike Rathke <erack@redhat.com> | 2018-06-14 15:00:14 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-06-18 12:20:31 +0200 |
| commit | 55af68aa8929f984075fd0ae762634cde1ed29d2 (patch) | |
| tree | 5d5cb1751a3291fccb1f3a2c5ea55b095d5aa96c | |
| parent | c5cc6a7289d8f891faa63bf0f37bbad3217d129a (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/55805
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -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; } |