mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I569766945d96eae74479e310d674c9420e9a2b4b
Reviewed-on: https://gerrit.libreoffice.org/3772
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
This commit is contained in:
Albert Thuswaldner 2013-05-04 01:39:24 +02:00 committed by Markus Mohrhard
parent 256e42646b
commit b9cd66b970
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sc/source/ui/dbgui/tpsort.cxx
View File

@ -184,7 +184,6 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
{
maSortKeyItems[i].m_pLbSort->SelectEntryPos( GetFieldSelPos(
aSortData.maKeyState[i].nField ) );
(aSortData.maKeyState[i].bAscending)
? maSortKeyItems[i].m_pBtnUp->Check()
: maSortKeyItems[i].m_pBtnDown->Check();
@ -234,6 +233,10 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
pDlg->SetByRows ( bSortByRows );
pDlg->SetHeaders( bHasHeader );
}
// Make sure that there is always a last undefined sort key
if ( maSortKeyItems[nSortKeyCount - 1].m_pLbSort->GetSelectEntryPos() > 0 )
SetLastSortKey( nSortKeyCount );
}
// -----------------------------------------------------------------------
@ -443,6 +446,25 @@ sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField )
return nFieldPos;
}
void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem )
{
// Extend local SortParam copy
const ScSortKeyState atempKeyState = { false, 0, true };
aSortData.maKeyState.push_back( atempKeyState );
// Add Sort Key Item
++nSortKeyCount;
maSortKeyCtrl.AddSortKey( nSortKeyCount );
maSortKeyItems[nItem].m_pLbSort->SetSelectHdl(
LINK( this, ScTabPageSortFields, SelectHdl ) );
FillFieldLists( nItem );
// Set Status
maSortKeyItems[nItem].m_pBtnUp->Check();
maSortKeyItems[nItem].m_pLbSort->SelectEntryPos( 0 );
}
// -----------------------------------------------------------------------
// Handler:
//---------
@ -451,26 +473,12 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
{
OUString aSelEntry = pLb->GetSelectEntry();
ScSortKeyItems::iterator pIter;
sal_uInt16 nSortKeyIndex = nSortKeyCount;
// If last listbox is enabled add one item
if ( maSortKeyItems.back().m_pLbSort == pLb )
if ( aSelEntry != aStrUndefined )
{
// Extend local SortParam copy
const ScSortKeyState atempKeyState = { false, 0, true };
aSortData.maKeyState.push_back( atempKeyState );
// Add Sort Key Item
++nSortKeyCount;
maSortKeyCtrl.AddSortKey( nSortKeyCount );
maSortKeyItems[nSortKeyIndex].m_pLbSort->SetSelectHdl( LINK( this, ScTabPageSortFields, SelectHdl ) );
FillFieldLists( nSortKeyIndex );
// Set Status
maSortKeyItems[nSortKeyIndex].m_pBtnUp->Check();
maSortKeyItems[nSortKeyIndex].m_pLbSort->SelectEntryPos( 0 );
SetLastSortKey( nSortKeyCount );
return 0;
}

1
sc/source/ui/inc/tpsort.hxx
View File

@ -95,6 +95,7 @@ private:
void Init ();
void FillFieldLists ( sal_uInt16 nStartField );
sal_uInt16 GetFieldSelPos ( SCCOLROW nField );
void SetLastSortKey( sal_uInt16 nItem );
// Handler ------------------------
DECL_LINK( SelectHdl, ListBox * );