diff options
Diffstat (limited to 'sc/source/ui/dbgui/tpsort.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/tpsort.cxx | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 4ee9d1109307..034afec316ad 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -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 ) { rtl::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; } |