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/pvfundlg.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/pvfundlg.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/pvfundlg.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index e54cc5ce619b..e1c7fe32e192 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -294,13 +294,13 @@ void ScDPFunctionDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa // select field reference type mxLbTypeWrp->SetControlValue( rFuncData.maFieldRef.ReferenceType ); - SelectHdl( mpLbType ); // enables base field/item list boxes + SelectHdl( *mpLbType.get() ); // enables base field/item list boxes // select base field mpLbBaseField->SelectEntry(aSelectedEntry); if( mpLbBaseField->GetSelectEntryPos() >= mpLbBaseField->GetEntryCount() ) mpLbBaseField->SelectEntryPos( 0 ); - SelectHdl( mpLbBaseField ); // fills base item list, selects base item + SelectHdl( *mpLbBaseField.get() ); // fills base item list, selects base item // select base item switch( rFuncData.maFieldRef.ReferenceItemType ) @@ -361,9 +361,9 @@ sal_Int32 ScDPFunctionDlg::FindBaseItemPos( const OUString& rEntry, sal_Int32 nS return bFound ? nPos : LISTBOX_ENTRY_NOTFOUND; } -IMPL_LINK( ScDPFunctionDlg, SelectHdl, ListBox*, pLBox ) +IMPL_LINK_TYPED( ScDPFunctionDlg, SelectHdl, ListBox&, rLBox, void ) { - if( pLBox == mpLbType ) + if( &rLBox == mpLbType ) { bool bEnableField, bEnableItem; switch( mxLbTypeWrp->GetControlValue() ) @@ -391,7 +391,7 @@ IMPL_LINK( ScDPFunctionDlg, SelectHdl, ListBox*, pLBox ) mpFtBaseItem->Enable( bEnableItem ); mpLbBaseItem->Enable( bEnableItem ); } - else if( pLBox == mpLbBaseField ) + else if( &rLBox == mpLbBaseField ) { // keep "previous" and "next" entries while( mpLbBaseItem->GetEntryCount() > SC_BASEITEM_USER_POS ) @@ -416,7 +416,6 @@ IMPL_LINK( ScDPFunctionDlg, SelectHdl, ListBox*, pLBox ) sal_uInt16 nItemPos = (mpLbBaseItem->GetEntryCount() > SC_BASEITEM_USER_POS) ? SC_BASEITEM_USER_POS : SC_BASEITEM_PREV_POS; mpLbBaseItem->SelectEntryPos( nItemPos ); } - return 0; } IMPL_LINK_NOARG_TYPED(ScDPFunctionDlg, DblClickHdl, ListBox&, void) @@ -811,14 +810,13 @@ IMPL_LINK_TYPED( ScDPSubtotalOptDlg, CheckHdl, Button*, pCBox, void ) } } -IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox ) +IMPL_LINK_TYPED( ScDPSubtotalOptDlg, SelectHdl, ListBox&, rLBox, void ) { - if (pLBox == m_pLbHierarchy) + if (&rLBox == m_pLbHierarchy) { mrDPObj.GetMembers(maLabelData.mnCol, m_pLbHierarchy->GetSelectEntryPos(), maLabelData.maMembers); InitHideListBox(); } - return 0; } ScDPShowDetailDlg::ScDPShowDetailDlg( vcl::Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) : |