summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2018-06-14 15:00:14 +0200
committerEike Rathke <erack@redhat.com>2018-06-14 22:28:31 +0200
commit9bec4997fe6bceabf381e07793d2c8ba38ee19da (patch)
tree0168dcd032a452170f628f9c6bc54d701ce2f00f
parent65a9e32b0ff3b2128d5381344f08ddacf758cece (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/55803 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
-rw-r--r--sc/source/core/tool/interpr6.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index a9b48d061b3c..c7554699bfa9 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;
}