diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-08-29 19:35:06 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-08-29 19:46:33 +0200 |
| commit | b705c6b4bd080dd0f7713286a1b19ce95850eb49 (patch) | |
| tree | 89c8dc967f2aef072bd8d400afee055fbf067c05 /sc/inc | |
| parent | e1d56d509bf52eb83b461f4e291d348caa6c119d (diff) | |
move ScProgress construction out of ScTable::Sort
Change-Id: I8e523fbb53b9c40075b62ee32d79eee0b408168e
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/document.hxx | 2 | ||||
| -rw-r--r-- | sc/inc/table.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index a2db35f8388c..efe8814ea67c 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1471,7 +1471,7 @@ public: SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const; - void Sort( SCTAB nTab, const ScSortParam& rSortParam, bool bKeepQuery ); + void Sort( SCTAB nTab, const ScSortParam& rSortParam, bool bKeepQuery, ScProgress* pProgress ); SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, bool bKeepSub ); SC_DLLPUBLIC bool CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScQueryParam& rQueryParam ); diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 223d38c9aea6..2b205e5c3042 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -753,7 +753,7 @@ public: void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); - void Sort(const ScSortParam& rSortParam, bool bKeepQuery); + void Sort(const ScSortParam& rSortParam, bool bKeepQuery, ScProgress* pProgress); bool ValidQuery( SCROW nRow, const ScQueryParam& rQueryParam, ScBaseCell* pCell = NULL, bool* pbTestEqualCondition = NULL); @@ -863,7 +863,7 @@ private: short Compare( ScSortInfoArray*, SCCOLROW nIndex1, SCCOLROW nIndex2) const; ScSortInfoArray* CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 ); void QuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi); - void SortReorder( ScSortInfoArray*, ScProgress& ); + void SortReorder( ScSortInfoArray*, ScProgress* ); bool CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); bool CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); |