diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-31 18:33:21 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-31 18:33:21 +0200 |
| commit | 1c78b6dc0d10eb5873c45d6185576633470a593d (patch) | |
| tree | 9d0b8a31009d826e071fa3c4a81ed033e8a6710d /sc/source/core/tool/dbdata.cxx | |
| parent | 3d86e4e7223b15d561d1efdac736e932ea41e6a0 (diff) | |
revert "remove limitation to 3 sort entries in calc part1"
Diffstat (limited to 'sc/source/core/tool/dbdata.cxx')
| -rw-r--r-- | sc/source/core/tool/dbdata.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 4c14735815fc..c612d32d9c9b 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -246,7 +246,7 @@ ScDBData::~ScDBData() aBuf.append(ScGlobal::GetRscString(STR_OPERATION_FILTER)); } - if (mpSortParam->maKeyState[0].bDoSort) + if (mpSortParam->bDoSort[0]) { if (aBuf.getLength()) aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); @@ -299,13 +299,13 @@ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n long nSortDif = bByRow ? nDifX : nDifY; long nSortEnd = bByRow ? static_cast<long>(nCol2) : static_cast<long>(nRow2); - for (i=0; i<mpSortParam->GetSortKeyCount(); i++) + for (i=0; i<MAXSORT; i++) { - mpSortParam->maKeyState[i].nField += nSortDif; - if (mpSortParam->maKeyState[i].nField > nSortEnd) + mpSortParam->nField[i] += nSortDif; + if (mpSortParam->nField[i] > nSortEnd) { - mpSortParam->maKeyState[i].nField = 0; - mpSortParam->maKeyState[i].bDoSort = false; + mpSortParam->nField[i] = 0; + mpSortParam->bDoSort[i] = false; } } @@ -460,7 +460,7 @@ bool ScDBData::HasQueryParam() const bool ScDBData::HasSortParam() const { - return mpSortParam && mpSortParam->maKeyState[0].bDoSort; + return mpSortParam && mpSortParam->bDoSort[0]; } bool ScDBData::HasSubTotalParam() const |