diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-04-05 05:05:40 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-04-05 05:05:40 +0200 |
| commit | 3e887edcaacc5b0f5e35d682a259124648e84229 (patch) | |
| tree | e8545d20a3e06e405e07386cba1d6d089ffb46fc /sc/source/ui/docshell/dbdocfun.cxx | |
| parent | a5eadc6aaafec92df23c57e258882a2c98ece0ad (diff) | |
Revert "Cleanup. ScPivot(Collection) is no more."
This reverts commit 568d3912bf8ced76ecb9506bccc3bd361daba082.
Diffstat (limited to 'sc/source/ui/docshell/dbdocfun.cxx')
| -rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 13b484ac0e5f..c315147419da 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -282,7 +282,7 @@ bool ScDBDocFunc::RepeatDB( const ::rtl::OUString& rDBName, bool bRecord, bool b ScSortParam aSortParam; pDBData->GetSortParam( aSortParam ); - sal_Bool bSort = aSortParam.bDoSort[0]; + sal_Bool bSort = aSortParam.maKeyState[0].bDoSort; ScSubTotalParam aSubTotalParam; pDBData->GetSubTotalParam( aSubTotalParam ); @@ -585,7 +585,7 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, } // don't call ScDocument::Sort with an empty SortParam (may be empty here if bCopy is set) - if ( aLocalParam.bDoSort[0] ) + if (aLocalParam.GetSortKeyCount() && aLocalParam.maKeyState[0].bDoSort) pDoc->Sort( nTab, aLocalParam, bRepeatQuery ); sal_Bool bSave = sal_True; @@ -593,7 +593,8 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, { ScSortParam aOldSortParam; pDBData->GetSortParam( aOldSortParam ); - if ( aOldSortParam.bDoSort[0] && aOldSortParam.bInplace ) // Inplace-Sortierung gemerkt? + if (aOldSortParam.GetSortKeyCount() && + aOldSortParam.maKeyState[0].bDoSort && aOldSortParam.bInplace) { bSave = false; aOldSortParam.nDestCol = rSortParam.nDestCol; |