diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-10-04 15:05:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-12 10:48:13 +0000 |
| commit | 3c99f8500f657ed84b316390d5175a6f5e56bc69 (patch) | |
| tree | 749f16652560a50d409b12a23bf1a5d93b3cd2d5 /sc/source/ui/dbgui/tpsort.cxx | |
| parent | bbadb38539eb233ac45b267034066a7274181c65 (diff) | |
convert Link<> to typed
Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb
Reviewed-on: https://gerrit.libreoffice.org/19305
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source/ui/dbgui/tpsort.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/tpsort.cxx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index b5ef0b344c33..c81e7ad19d6e 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -442,23 +442,23 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem ) // Handler: -IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) +IMPL_LINK_TYPED( ScTabPageSortFields, SelectHdl, ListBox&, rLb, void ) { - OUString aSelEntry = pLb->GetSelectEntry(); + OUString aSelEntry = rLb.GetSelectEntry(); ScSortKeyItems::iterator pIter; // If last listbox is enabled add one item - if ( maSortKeyItems.back().m_pLbSort == pLb ) + if ( maSortKeyItems.back().m_pLbSort == &rLb ) if ( aSelEntry != aStrUndefined ) { SetLastSortKey( nSortKeyCount ); - return 0; + return; } // Find selected listbox for ( pIter = maSortKeyItems.begin(); pIter != maSortKeyItems.end(); ++pIter ) { - if ( pIter->m_pLbSort == pLb ) break; + if ( pIter->m_pLbSort == &rLb ) break; } // If not selecting the last Listbox, modify the succeeding ones @@ -481,7 +481,6 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) pIter->EnableField(); } } - return 0; } // Sort option Tab Page: @@ -678,7 +677,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ ) if ( eLang == LANGUAGE_DONTKNOW ) eLang = LANGUAGE_SYSTEM; m_pLbLanguage->SelectLanguage( eLang ); - FillAlgorHdl(m_pLbLanguage); // get algorithms, select default + FillAlgorHdl(*m_pLbLanguage.get()); // get algorithms, select default if ( !aSortData.aCollatorAlgorithm.isEmpty() ) m_pLbAlgorithm->SelectEntry( pColRes->GetTranslation( aSortData.aCollatorAlgorithm ) ); @@ -876,9 +875,9 @@ IMPL_LINK_TYPED( ScTabPageSortOptions, EnableHdl, Button*, pButton, void ) } } -IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) +IMPL_LINK_TYPED( ScTabPageSortOptions, SelOutPosHdl, ListBox&, rLb, void ) { - if (pLb == m_pLbOutPos) + if (&rLb == m_pLbOutPos) { OUString aString; const sal_Int32 nSelPos = m_pLbOutPos->GetSelectEntryPos(); @@ -888,7 +887,6 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) m_pEdOutPos->SetText( aString ); } - return 0; } IMPL_LINK_TYPED( ScTabPageSortOptions, SortDirHdl, Button *, pBtn, void ) @@ -930,7 +928,7 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) } } -IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) +IMPL_LINK_NOARG_TYPED(ScTabPageSortOptions, FillAlgorHdl, ListBox&, void) { m_pLbAlgorithm->SetUpdateMode( false ); m_pLbAlgorithm->Clear(); @@ -963,7 +961,6 @@ IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) } m_pLbAlgorithm->SetUpdateMode( true ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |