summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorWinfried Donkers <winfrieddonkers@libreoffice.org>2018-04-06 19:55:12 +0200
committerEike Rathke <erack@redhat.com>2018-04-09 19:02:18 +0200
commit0a4c1fb68c3619e61099a7c548f550b0d3fd7a53 (patch)
treefbf40dc6b7f2877c38c7b60e305c82797a34496d /sc/source
parentf54cb7cc81ba3c485e24e6d9820cf8dced12081b (diff)
tdf#116706 fix for AGGREGATE with hidden rows and single references.
Change-Id: I6ac88f26b46a17e1857b7b40d2034fb321973625 Reviewed-on: https://gerrit.libreoffice.org/52522 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/core/tool/interpr6.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index e1bc0d696b0b..4d5febc210e1 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -678,8 +678,10 @@ void ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero )
++nCount;
break;
}
- if ( ( mnSubTotalFlags & SubtotalFlags::IgnoreFiltered ) &&
- pDok->RowFiltered( aAdr.Row(), aAdr.Tab() ) )
+ if ( ( ( mnSubTotalFlags & SubtotalFlags::IgnoreFiltered ) &&
+ pDok->RowFiltered( aAdr.Row(), aAdr.Tab() ) ) ||
+ ( ( mnSubTotalFlags & SubtotalFlags::IgnoreHidden ) &&
+ pDok->RowHidden( aAdr.Row(), aAdr.Tab() ) ) )
{
break;
}