diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-01-06 16:12:28 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-01-06 16:15:19 -0500 |
| commit | 4a7a6b46c0dc779581f271b9e6c13c365eca7ab8 (patch) | |
| tree | 63bf1ad1ecef31fae25ee8f7f226065b21d804cf /sc/inc | |
| parent | c0d5d26ad74cc7b6470d1e0c8951bee548c7ba17 (diff) | |
fdo#73001: Simplify the selection function logic & calculate correct results.
Fixing a bug and cleaning up the code all at the same time. And don't forget
to write test for it as well.
Change-Id: Ia0322c4bebd4c5debcbfa4bb0902afbe581208b2
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/column.hxx | 7 | ||||
| -rw-r--r-- | sc/inc/table.hxx | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 6ec33360b2c3..8b09db3ef7ff 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -237,13 +237,8 @@ public: ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const; - // UpdateSelectionFunction: multi-select void UpdateSelectionFunction( - const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, - bool bDoExclude, SCROW nExStartRow, SCROW nExEndRow ); - - void UpdateAreaFunction( - ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, SCROW nStartRow, SCROW nEndRow); + const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows ); void CopyToColumn( sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, bool bMarked, diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 09d541b304d6..68a17912fe6a 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -542,9 +542,7 @@ public: double nStepValue, double nMaxValue, ScProgress* pProgress); OUString GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); - void UpdateSelectionFunction( ScFunctionData& rData, - SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - const ScMarkData& rMark ); + void UpdateSelectionFunction( ScFunctionData& rData, const ScMarkData& rMark ); void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_uInt16 nFormatNo ); |