[PATCH libreoffice-4-0] fdo#51828 - UI: Sort: can use more than 3 criteria once only

[Albert Thuswaldner (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3350

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/3350/1

fdo#51828 - UI: Sort: can use more than 3 criteria once only

Change-Id: I7480e8d606e1eafde45635e36dfafa4232f529cb
Reviewed-on: https://gerrit.libreoffice.org/3217
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
---
M sc/source/ui/dbgui/tpsort.cxx
1 file changed, 11 insertions(+), 2 deletions(-)



diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 4c56058..6731e71 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -168,9 +168,19 @@
     // ListBox selection:
     if ( aSortData.maKeyState[0].bDoSort )
     {
+        // Make sure that the all sort keys are reset
+        for ( sal_uInt16 i=nSortKeyCount; i<aSortData.maKeyState.size(); i++ )
+        {
+            maSortKeyCtrl.AddSortKey(i+1);
+            maSortKeyItems[i].m_pLbSort->SetSelectHdl( LINK( this,
+                                 ScTabPageSortFields, SelectHdl ) );
+        }
+        nSortKeyCount = aSortData.maKeyState.size();
+        FillFieldLists(0);
+
         for ( sal_uInt16 i=0; i<nSortKeyCount; i++ )
         {
-            if ( i < aSortData.maKeyState.size() && aSortData.maKeyState[i].bDoSort )
+            if (aSortData.maKeyState[i].bDoSort )
             {
                 maSortKeyItems[i].m_pLbSort->SelectEntryPos( GetFieldSelPos(
                                     aSortData.maKeyState[i].nField ) );
@@ -193,7 +203,6 @@
                 maSortKeyItems[i].DisableField();
             else
                 maSortKeyItems[i].EnableField();
-
     }
     else
     {

-- 
To view, visit https://gerrit.libreoffice.org/3350
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7480e8d606e1eafde45635e36dfafa4232f529cb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Albert Thuswaldner <albert.thuswaldner at gmail.com>
Gerrit-Reviewer: Caolán McNamara <caolanm at redhat.com>