From 3f4218ac543f49331e42869e632922cf5fbb5bda Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Mon, 24 Apr 2017 00:21:30 +0200 Subject: tdf#107147 ignore subtotals and grandtotals when gathering labels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When gathering the labels and categories for the pivot chart, ignore subtotals and grandtotals so they don't end up in the chart. Change-Id: I45e80a59531d6a048a22016132e9bef280bb325c Reviewed-on: https://gerrit.libreoffice.org/36868 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- sc/source/ui/unoobj/PivotTableDataProvider.cxx | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'sc') diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx index 23323663c45b..fe1e383de966 100644 --- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx +++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx @@ -350,6 +350,10 @@ void PivotTableDataProvider::collectPivotTableData() OUString sName; for (sheet::MemberResult const & rMember : aSequence) { + if (rMember.Flags & sheet::MemberResultFlags::SUBTOTAL || + rMember.Flags & sheet::MemberResultFlags::GRANDTOTAL) + continue; + if (rMember.Flags & sheet::MemberResultFlags::HASMEMBER || rMember.Flags & sheet::MemberResultFlags::CONTINUE) { @@ -390,6 +394,9 @@ void PivotTableDataProvider::collectPivotTableData() for (sheet::MemberResult const & rMember : aSequence) { bool bHasContinueFlag = rMember.Flags & sheet::MemberResultFlags::CONTINUE; + if (rMember.Flags & sheet::MemberResultFlags::SUBTOTAL || + rMember.Flags & sheet::MemberResultFlags::GRANDTOTAL) + continue; if (rMember.Flags & sheet::MemberResultFlags::HASMEMBER || bHasContinueFlag) { -- cgit