diff options
| author | Albert Thuswaldner <albert.thuswaldner@gmail.com> | 2012-03-20 19:38:29 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-04-04 07:53:10 +0200 |
| commit | a02b445c39d969fedc554fc2c500b88a27a13906 (patch) | |
| tree | 0d8109abf6ea285c7b661101faa3a967ea0908bd /sc/source/ui/vba/vbarange.cxx | |
| parent | 62d745ddde6b60aaaa796123f45b3df8c10e9869 (diff) | |
fdo#45747 remove the limitation to 3 sort entries in calc part1
Diffstat (limited to 'sc/source/ui/vba/vbarange.cxx')
| -rw-r--r-- | sc/source/ui/vba/vbarange.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 1953b6f05c12..dda593ca8f78 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -3539,9 +3539,9 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& // set up defaults - sal_Int16 nOrder1 = aSortParam.bAscending[0] ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending; - sal_Int16 nOrder2 = aSortParam.bAscending[1] ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending; - sal_Int16 nOrder3 = aSortParam.bAscending[2] ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending; + sal_Int16 nOrder1 = aSortParam.maKeyState[1].bAscending ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending; + sal_Int16 nOrder2 = aSortParam.maKeyState[2].bAscending ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending; + sal_Int16 nOrder3 = aSortParam.maKeyState[3].bAscending ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending; sal_Int16 nCustom = aSortParam.nUserIndex; sal_Int16 nSortMethod = excel::XlSortMethod::xlPinYin; @@ -3620,26 +3620,26 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& { nOrder1 = ::comphelper::getINT16(Order1); if ( nOrder1 == excel::XlSortOrder::xlAscending ) - aSortParam.bAscending[0] = true; + aSortParam.maKeyState[0].bAscending = true; else - aSortParam.bAscending[0] = false; + aSortParam.maKeyState[0].bAscending = false; } if ( Order2.hasValue() ) { nOrder2 = ::comphelper::getINT16(Order2); if ( nOrder2 == excel::XlSortOrder::xlAscending ) - aSortParam.bAscending[1] = true; + aSortParam.maKeyState[1].bAscending = true; else - aSortParam.bAscending[1] = false; + aSortParam.maKeyState[1].bAscending = false; } if ( Order3.hasValue() ) { nOrder3 = ::comphelper::getINT16(Order3); if ( nOrder3 == excel::XlSortOrder::xlAscending ) - aSortParam.bAscending[2] = true; + aSortParam.maKeyState[2].bAscending = true; else - aSortParam.bAscending[2] = false; + aSortParam.maKeyState[2].bAscending = false; } uno::Reference< table::XCellRange > xKey1; |