summaryrefslogtreecommitdiff
path: root/sc/source/ui/dbgui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/dbgui')
-rw-r--r--sc/source/ui/dbgui/PivotLayoutDialog.cxx7
-rw-r--r--sc/source/ui/dbgui/consdlg.cxx13
-rw-r--r--sc/source/ui/dbgui/dapidata.cxx3
-rw-r--r--sc/source/ui/dbgui/filtdlg.cxx42
-rw-r--r--sc/source/ui/dbgui/foptmgr.cxx6
-rw-r--r--sc/source/ui/dbgui/pfiltdlg.cxx15
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx16
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx18
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx6
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx21
-rw-r--r--sc/source/ui/dbgui/tpsubt.cxx13
-rw-r--r--sc/source/ui/dbgui/validate.cxx15
12 files changed, 81 insertions, 94 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 87eb9c75ee6e..7ef844199185 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -124,7 +124,7 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
mpSourceButton->SetLoseFocusHdl(aLink);
mpSourceEdit->SetModifyHdl(LINK(this, ScPivotLayoutDialog, SourceEditModified));
- mpSourceListBox->SetSelectHdl(LINK(this, ScPivotLayoutDialog, SourceEditModified));
+ mpSourceListBox->SetSelectHdl(LINK(this, ScPivotLayoutDialog, SourceListSelected));
// Destination UI
aLink2 = LINK(this, ScPivotLayoutDialog, ToggleDestination);
@@ -677,6 +677,11 @@ IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, LoseFocusHandler, Control&, void)
mbDialogLostFocus = !IsActive();
}
+IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, SourceListSelected, ListBox&, void)
+{
+ UpdateSourceRange();
+}
+
IMPL_LINK_NOARG(ScPivotLayoutDialog, SourceEditModified)
{
UpdateSourceRange();
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index ab3772cd7ec3..16b2f0c52b06 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -483,19 +483,19 @@ IMPL_LINK_TYPED( ScConsolidateDlg, ClickHdl, Button*, pBtn, void )
}
}
-IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
+IMPL_LINK_TYPED( ScConsolidateDlg, SelectHdl, ListBox&, rLb, void )
{
- if ( pLb == pLbConsAreas )
+ if ( &rLb == pLbConsAreas )
{
if ( pLbConsAreas->GetSelectEntryCount() > 0 )
pBtnRemove->Enable();
else
pBtnRemove->Disable();
}
- else if ( (pLb == pLbDataArea) || (pLb == pLbDestArea) )
+ else if ( (&rLb == pLbDataArea) || (&rLb == pLbDestArea) )
{
- Edit* pEd = (pLb == pLbDataArea) ? pEdDataArea : pEdDestArea;
- const sal_Int32 nSelPos = pLb->GetSelectEntryPos();
+ Edit* pEd = (&rLb == pLbDataArea) ? pEdDataArea : pEdDestArea;
+ const sal_Int32 nSelPos = rLb.GetSelectEntryPos();
if ( pRangeUtil
&& (nSelPos > 0)
@@ -506,7 +506,7 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
{
OUString aString( pAreaData[nSelPos-1].aStrArea );
- if ( pLb == pLbDestArea )
+ if ( &rLb == pLbDestArea )
ScRangeUtil::CutPosString( aString, aString );
pEd->SetText( aString );
@@ -522,7 +522,6 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
pBtnAdd->Enable();
}
}
- return 0;
}
IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd )
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 93bcce13684c..60b4b5cdfb1c 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -114,10 +114,9 @@ void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc )
rDesc.bNative = ( nSelect == DP_TYPELIST_SQLNAT );
}
-IMPL_LINK_NOARG(ScDataPilotDatabaseDlg, SelectHdl)
+IMPL_LINK_NOARG_TYPED(ScDataPilotDatabaseDlg, SelectHdl, ListBox&, void)
{
FillObjects();
- return 0;
}
void ScDataPilotDatabaseDlg::FillObjects()
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 15cf1d13dc42..94b1148af7b7 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -764,14 +764,14 @@ IMPL_LINK_TYPED( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void )
pTimer->Start();
}
-IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
+IMPL_LINK_TYPED( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
{
/*
* Handle enable/disable logic depending on which ListBox was selected
*/
sal_uInt16 nOffset = GetSliderPos();
- if ( pLb == pLbConnect1 )
+ if ( &rLb == pLbConnect1 )
{
pLbField1->Enable();
pLbCond1->Enable();
@@ -785,7 +785,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
maRefreshExceptQuery[nQE] = true;
}
- else if ( pLb == pLbConnect2 )
+ else if ( &rLb == pLbConnect2 )
{
pLbField2->Enable();
pLbCond2->Enable();
@@ -798,7 +798,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
maRefreshExceptQuery.resize(nQE + 1, false);
maRefreshExceptQuery[nQE]=true;
}
- else if ( pLb == pLbConnect3 )
+ else if ( &rLb == pLbConnect3 )
{
pLbField3->Enable();
pLbCond3->Enable();
@@ -812,7 +812,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
maRefreshExceptQuery[nQE] = true;
}
- else if ( pLb == pLbConnect4 )
+ else if ( &rLb == pLbConnect4 )
{
pLbField4->Enable();
pLbCond4->Enable();
@@ -825,7 +825,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
maRefreshExceptQuery.resize(nQE + 1, false);
maRefreshExceptQuery[nQE] = true;
}
- else if ( pLb == pLbField1 )
+ else if ( &rLb == pLbField1 )
{
if ( pLbField1->GetSelectEntryPos() == 0 )
{
@@ -874,11 +874,11 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
pLbConnect2->Enable();
}
theQueryData.GetEntry(nOffset).bDoQuery = true;
- const sal_Int32 nField = pLb->GetSelectEntryPos();
+ const sal_Int32 nField = rLb.GetSelectEntryPos();
theQueryData.GetEntry(nOffset).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
}
}
- else if ( pLb == pLbField2 )
+ else if ( &rLb == pLbField2 )
{
if ( pLbField2->GetSelectEntryPos() == 0 )
{
@@ -920,13 +920,13 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
{
pLbConnect3->Enable();
}
- const sal_Int32 nField = pLb->GetSelectEntryPos();
+ const sal_Int32 nField = rLb.GetSelectEntryPos();
sal_uInt16 nQ=1+nOffset;
theQueryData.GetEntry(nQ).bDoQuery = true;
theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
}
}
- else if ( pLb == pLbField3 )
+ else if ( &rLb == pLbField3 )
{
if ( pLbField3->GetSelectEntryPos() == 0 )
{
@@ -961,14 +961,14 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
pLbConnect4->Enable();
}
- const sal_Int32 nField = pLb->GetSelectEntryPos();
+ const sal_Int32 nField = rLb.GetSelectEntryPos();
sal_uInt16 nQ=2+nOffset;
theQueryData.GetEntry(nQ).bDoQuery = true;
theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
}
}
- else if ( pLb == pLbField4 )
+ else if ( &rLb == pLbField4 )
{
if ( pLbField4->GetSelectEntryPos() == 0 )
{
@@ -988,34 +988,32 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
else
{
UpdateValueList( 4 );
- const sal_Int32 nField = pLb->GetSelectEntryPos();
+ const sal_Int32 nField = rLb.GetSelectEntryPos();
sal_uInt16 nQ=3+nOffset;
theQueryData.GetEntry(nQ).bDoQuery = true;
theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
}
}
- else if ( pLb == pLbCond1)
+ else if ( &rLb == pLbCond1)
{
- theQueryData.GetEntry(nOffset).eOp=(ScQueryOp)pLb->GetSelectEntryPos();
+ theQueryData.GetEntry(nOffset).eOp=(ScQueryOp)rLb.GetSelectEntryPos();
}
- else if ( pLb == pLbCond2)
+ else if ( &rLb == pLbCond2)
{
sal_uInt16 nQ=1+nOffset;
- theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos();
+ theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectEntryPos();
}
- else if ( pLb == pLbCond3)
+ else if ( &rLb == pLbCond3)
{
sal_uInt16 nQ=2+nOffset;
- theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos();
+ theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectEntryPos();
}
else
{
sal_uInt16 nQ=3+nOffset;
- theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos();
+ theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectEntryPos();
}
-
- return 0;
}
IMPL_LINK_TYPED( ScFilterDlg, CheckBoxHdl, Button*, pBox, void )
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 29b6dc2c5e93..847b5b737b0f 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -209,9 +209,9 @@ bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const
// Handler:
-IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb )
+IMPL_LINK_TYPED( ScFilterOptionsMgr, LbAreaSelHdl, ListBox&, rLb, void )
{
- if ( pLb == pLbCopyArea )
+ if ( &rLb == pLbCopyArea )
{
OUString aString;
const sal_Int32 nSelPos = pLbCopyArea->GetSelectEntryPos();
@@ -221,8 +221,6 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb )
pEdCopyArea->SetText( aString );
}
-
- return 0;
}
IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd )
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 078fbfc01d5b..1b3a155a0752 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -429,13 +429,14 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
// Handler:
-IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb )
+IMPL_LINK_TYPED( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void )
{
/*
* Handling the enable/disable logic based on which ListBox was touched:
*/
- if (pLb == m_pLbConnect1)
+
+ if (&rLb == m_pLbConnect1)
{
if ( !m_pLbField2->IsEnabled() )
{
@@ -444,7 +445,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb )
m_pEdVal2->Enable();
}
}
- else if (pLb == m_pLbConnect2)
+ else if (&rLb == m_pLbConnect2)
{
if ( !m_pLbField3->IsEnabled() )
{
@@ -453,7 +454,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb )
m_pEdVal3->Enable();
}
}
- else if (pLb == m_pLbField1)
+ else if (&rLb == m_pLbField1)
{
if ( m_pLbField1->GetSelectEntryPos() == 0 )
{
@@ -485,7 +486,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb )
}
}
}
- else if (pLb == m_pLbField2)
+ else if (&rLb == m_pLbField2)
{
if ( m_pLbField2->GetSelectEntryPos() == 0 )
{
@@ -509,14 +510,12 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb )
}
}
}
- else if (pLb == m_pLbField3)
+ else if (&rLb == m_pLbField3)
{
( m_pLbField3->GetSelectEntryPos() == 0 )
? ClearValueList( 3 )
: UpdateValueList( 3 );
}
-
- return 0;
}
IMPL_LINK_TYPED( ScPivotFilterDlg, CheckBoxHdl, Button*, pBox, void )
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 ) :
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 0dffe036b483..5fe87be77c87 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -705,10 +705,9 @@ IMPL_LINK( ScImportAsciiDlg, SeparatorHdl, Control*, pCtrl )
return 0;
}
-IMPL_LINK( ScImportAsciiDlg, CharSetHdl, SvxTextEncodingBox*, pCharSetBox )
+IMPL_LINK_TYPED( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void )
{
- OSL_ENSURE( pCharSetBox, "ScImportAsciiDlg::CharSetHdl - missing sender" );
-
+ SvxTextEncodingBox* pCharSetBox = static_cast<SvxTextEncodingBox*>(&rListBox);
if( (pCharSetBox == pLbCharSet) && (pCharSetBox->GetSelectEntryCount() == 1) )
{
SetPointer( Pointer( PointerStyle::Wait ) );
@@ -721,7 +720,6 @@ IMPL_LINK( ScImportAsciiDlg, CharSetHdl, SvxTextEncodingBox*, pCharSetBox )
mpTableBox->Execute( CSVCMD_NEWCELLTEXTS );
SetPointer( Pointer( PointerStyle::Arrow ) );
}
- return 0;
}
IMPL_LINK( ScImportAsciiDlg, FirstRowHdl, NumericField*, pNumField )
@@ -731,12 +729,10 @@ IMPL_LINK( ScImportAsciiDlg, FirstRowHdl, NumericField*, pNumField )
return 0;
}
-IMPL_LINK( ScImportAsciiDlg, LbColTypeHdl, ListBox*, pListBox )
+IMPL_LINK_TYPED( ScImportAsciiDlg, LbColTypeHdl, ListBox&, rListBox, void )
{
- OSL_ENSURE( pListBox, "ScImportAsciiDlg::LbColTypeHdl - missing sender" );
- if( pListBox == pLbType )
- mpTableBox->Execute( CSVCMD_SETCOLUMNTYPE, pListBox->GetSelectEntryPos() );
- return 0;
+ if( &rListBox == pLbType )
+ mpTableBox->Execute( CSVCMD_SETCOLUMNTYPE, rListBox.GetSelectEntryPos() );
}
IMPL_LINK_NOARG_TYPED(ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox&, void)
@@ -774,8 +770,8 @@ IMPL_LINK_TYPED( ScImportAsciiDlg, ColTypeHdl, ScCsvTableBox&, rTableBox, void )
pFtType->Enable( bEnable );
pLbType->Enable( bEnable );
- Link<> aSelHdl = pLbType->GetSelectHdl();
- pLbType->SetSelectHdl( Link<>() );
+ Link<ListBox&,void> aSelHdl = pLbType->GetSelectHdl();
+ pLbType->SetSelectHdl( Link<ListBox&,void>() );
if( bEmpty )
pLbType->SetNoSelection();
else if( bEnable )
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 92753b06d6dd..f4f972d83bb2 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -425,9 +425,9 @@ IMPL_LINK_TYPED( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void )
pIdle->Start();
}
-IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb )
+IMPL_LINK_TYPED( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void )
{
- if ( pLb == pLbFilterArea )
+ if ( &rLb == pLbFilterArea )
{
OUString aString;
const sal_Int32 nSelPos = pLbFilterArea->GetSelectEntryPos();
@@ -437,8 +437,6 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb )
pEdFilterArea->SetText( aString );
}
-
- return 0;
}
IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd )
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: */
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 04c1de102261..ab1bf01394b5 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -100,10 +100,10 @@ void ScTpSubTotalGroup::Init()
OSL_ENSURE( pViewData && pDoc, "ViewData or Document not found :-(" );
- mpLbGroup->SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
+ mpLbGroup->SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectListBoxHdl ) );
mpLbColumns->SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectTreeListBoxHdl ) );
mpLbColumns->SetCheckButtonHdl( LINK( this, ScTpSubTotalGroup, CheckHdl ) );
- mpLbFunctions->SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
+ mpLbFunctions->SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectListBoxHdl ) );
nFieldArr[0] = 0;
FillListBoxes();
@@ -346,7 +346,11 @@ IMPL_LINK_TYPED( ScTpSubTotalGroup, SelectTreeListBoxHdl, SvTreeListBox*, pLb, v
{
SelectHdl(pLb);
}
-IMPL_LINK( ScTpSubTotalGroup, SelectHdl, void *, pLb )
+IMPL_LINK_TYPED( ScTpSubTotalGroup, SelectListBoxHdl, ListBox&, rLb, void )
+{
+ SelectHdl(&rLb);
+}
+void ScTpSubTotalGroup::SelectHdl(void *pLb)
{
if ( (mpLbColumns->GetEntryCount() > 0)
&& (mpLbColumns->GetSelectionCount() > 0) )
@@ -357,7 +361,7 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, void *, pLb )
OSL_ENSURE( pFunction, "EntryData not found!" );
if ( !pFunction )
- return 0;
+ return;
if ( pLb == mpLbColumns )
{
@@ -369,7 +373,6 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, void *, pLb )
mpLbColumns->CheckEntryPos( nColumn );
}
}
- return 0;
}
IMPL_LINK_TYPED( ScTpSubTotalGroup, CheckHdl, SvTreeListBox*, pLb, void )
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index ae2628455887..6b0b56abf78c 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -401,7 +401,7 @@ void ScTPValidationValue::Init()
m_pLbAllow->SelectEntryPos( SC_VALIDDLG_ALLOW_ANY );
m_pLbValue->SelectEntryPos( SC_VALIDDLG_DATA_EQUAL );
- SelectHdl( NULL );
+ SelectHdl( *m_pLbAllow.get() );
CheckHdl( NULL );
}
@@ -449,7 +449,7 @@ void ScTPValidationValue::Reset( const SfxItemSet* rArgSet )
aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue();
SetSecondFormula( aFmlaStr );
- SelectHdl( NULL );
+ SelectHdl( *m_pLbAllow.get() );
CheckHdl( NULL );
}
@@ -598,7 +598,7 @@ IMPL_LINK_TYPED( ScTPValidationValue, KillFocusHdl, Control&, rControl, void )
}
}
-IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl)
+IMPL_LINK_NOARG_TYPED(ScTPValidationValue, SelectHdl, ListBox&, void)
{
const sal_Int32 nLbPos = m_pLbAllow->GetSelectEntryPos();
bool bEnable = (nLbPos != SC_VALIDDLG_ALLOW_ANY);
@@ -657,7 +657,6 @@ IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl)
m_pEdMax->Show( bShowMax );
m_pFtHint->Show( bRange );
m_pBtnRef->Show( bRange ); // cell range picker
- return 0;
}
IMPL_LINK_NOARG_TYPED(ScTPValidationValue, CheckHdl, Button*, void)
@@ -779,7 +778,7 @@ void ScTPValidationError::Init()
m_pLbAction->SelectEntryPos( 0 );
m_pTsbShow->EnableTriState( false );
- SelectActionHdl( NULL );
+ SelectActionHdl( *m_pLbAction.get() );
}
VclPtr<SfxTabPage> ScTPValidationError::Create( vcl::Window* pParent,
@@ -812,7 +811,7 @@ void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
else
m_pEdError->SetText( EMPTY_OUSTRING );
- SelectActionHdl( NULL );
+ SelectActionHdl( *m_pLbAction.get() );
}
bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet )
@@ -825,7 +824,7 @@ bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet )
return true;
}
-IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl)
+IMPL_LINK_NOARG_TYPED(ScTPValidationError, SelectActionHdl, ListBox&, void)
{
ScValidErrorStyle eStyle = (ScValidErrorStyle) m_pLbAction->GetSelectEntryPos();
bool bMacro = ( eStyle == SC_VALERR_MACRO );
@@ -833,8 +832,6 @@ IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl)
m_pBtnSearch->Enable( bMacro );
m_pFtError->Enable( !bMacro );
m_pEdError->Enable( !bMacro );
-
- return 0L;
}
IMPL_LINK_NOARG_TYPED(ScTPValidationError, ClickSearchHdl, Button*, void)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 03:52:34 +0000