summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorWinfried Donkers <winfrieddonkers@libreoffice.org>2015-04-17 11:06:30 +0200
committerEike Rathke <erack@redhat.com>2015-07-06 21:59:45 +0000
commit5d88cb48a77e65810ea6d0be32b5387b1767a216 (patch)
treefac28ae5af07938868c3de95f11a166b9569e13f /sc/inc
parentdacdb66fd52380caa079cd8eac61bb9b01bcfe4c (diff)
unify code duplication in ScInterpreter::ScSum and IterateParameters
The code in ScSum is mostly identical with that in IterateParameters. Worse, functions like SUBTOTAL and AGGREGATE use IterateParameters for the SUM function. Now we have one set of code for all SUM-functions and averted the danger of diverting pieces of code which are supposed to do the same thing. Removed old-style bNull-method too. Change-Id: Ia4f22c21c4b3c3a244ea1cd10c30d8cfcaa8ef6c Reviewed-on: https://gerrit.libreoffice.org/15362 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/columnspanset.hxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 797b425579c5..741b85508a88 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -84,6 +84,7 @@ public:
virtual ~ColumnAction() = 0;
virtual void startColumn(ScColumn* pCol) = 0;
virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal) = 0;
+ virtual void executeSum(SCROW, SCROW, bool, double& ) { return; } ;
};
ColumnSpanSet(bool bInit);
@@ -103,6 +104,7 @@ public:
void executeAction(Action& ac) const;
void executeColumnAction(ScDocument& rDoc, ColumnAction& ac) const;
+ void executeColumnAction(ScDocument& rDoc, ColumnAction& ac, double& fMem) const;
void swap( ColumnSpanSet& r );
};