diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-16 05:25:32 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-16 05:25:32 +0200 |
commit | 1cf19ea84794ca065749667b480dfed2d27d47b7 (patch) | |
tree | 4aec42e164a4dbdcd752903f3ec6994de96bde77 /sc/inc | |
parent | 17f6f60c1c20782fb1cde69b949b97c2f3b0d830 (diff) |
don't call ScMarkData::GetMarkedRanges in ScColumn, related fdo#79422
This drops the calls to ScMarkData::GetMarkedRanges by a factor of 1k.
Change-Id: I12b1ab3877120a1fbccaccaa7996cbb7efe948b6
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/column.hxx | 3 | ||||
-rw-r--r-- | sc/inc/columnspanset.hxx | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index fb1eb97d0e33..a14a43f24473 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -24,6 +24,7 @@ #include "global.hxx" #include "address.hxx" #include "rangenam.hxx" +#include "rangelst.hxx" #include "types.hxx" #include "mtvelements.hxx" #include <formula/types.hxx> @@ -262,7 +263,7 @@ public: ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const; void UpdateSelectionFunction( - const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows ); + const ScRangeList& rRanges, ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows ); void CopyToColumn( sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, bool bMarked, diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx index 7c7fdf524010..f397c3e6292e 100644 --- a/sc/inc/columnspanset.hxx +++ b/sc/inc/columnspanset.hxx @@ -20,6 +20,7 @@ class ScDocument; class ScColumn; class ScMarkData; class ScRange; +class ScRangeList; namespace sc { @@ -132,6 +133,8 @@ public: */ void scan(const ScMarkData& rMark, SCTAB nTab, SCCOL nCol); + void scan(const ScRangeList& rRanges, SCTAB nTab, SCCOL nCol); + void set(SCROW nRow1, SCROW nRow2, bool bVal); void getRows(std::vector<SCROW> &rRows) const; |