diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-04-04 08:07:36 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-04-04 08:07:36 +0200 |
| commit | d3e518738973fdad6d5426f2a9318aa54e224a2c (patch) | |
| tree | 8a5447b7faef8951af0d5da545067cc1e17d8d3f /sc | |
| parent | 71402a06a5aaf8ea5f8d956dabe513dab52bd421 (diff) | |
some small corrections to the sort entry patches
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/unoobj/datauno.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index c2243eed8921..8380c0b99bce 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -425,8 +425,8 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b sal_Int32 i; if ( nCount > static_cast<sal_Int32>( rParam.GetSortKeyCount() ) ) { - OSL_FAIL("Zu viele Sortierfelder"); nCount = nSortSize; + rParam.maKeyState.resize(nCount); } const util::SortField* pFieldArray = aSeq.getConstArray(); for (i=0; i<nCount; i++) @@ -435,7 +435,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b rParam.maKeyState[i].bAscending = pFieldArray[i].SortAscending; // FieldType wird ignoriert - rParam.maKeyState[i].bDoSort = sal_True; + rParam.maKeyState[i].bDoSort = true; } for (i=nCount; i<nSortSize; i++) rParam.maKeyState[i].bDoSort = false; @@ -446,8 +446,8 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b sal_Int32 i; if ( nCount > nSortSize ) { - OSL_FAIL("Zu viele Sortierfelder"); nCount = nSortSize; + rParam.maKeyState.resize(nCount); } const table::TableSortField* pFieldArray = aNewSeq.getConstArray(); for (i=0; i<nCount; i++) @@ -461,7 +461,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b rParam.aCollatorAlgorithm = pFieldArray[i].CollatorAlgorithm; // FieldType wird ignoriert - rParam.maKeyState[i].bDoSort = sal_True; + rParam.maKeyState[i].bDoSort = true; } for (i=nCount; i<nSortSize; i++) rParam.maKeyState[i].bDoSort = false; |