summaryrefslogtreecommitdiff
path: root/sc/source/ui/dbgui/pvfundlg.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/dbgui/pvfundlg.cxx')
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx16
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 ) :