diff options
Diffstat (limited to 'sc/source')
67 files changed, 254 insertions, 312 deletions
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index 72afc4fea95f..3f2c93005b57 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -358,7 +358,7 @@ IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, LoseFocusHandler, Control&, mbDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, InputRangeModified) +IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, InputRangeModified, Edit&, void) { ScRangeList aRangeList; bool bValid = ParseWithNames( aRangeList, mpInputRangeEdit->GetText(), mpDoc); @@ -377,10 +377,9 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, InputRangeModified) mpButtonApply->Disable(); mpButtonOk->Disable(); } - return 0; } -IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter1ValueModified) +IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, Parameter1ValueModified, Edit&, void) { sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) ); @@ -394,10 +393,9 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter1ValueModified) mpParameter2Value->SetValue(min); } } - return 0; } -IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter2ValueModified) +IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, Parameter2ValueModified, Edit&, void) { sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) ); @@ -411,7 +409,6 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter2ValueModified) mpParameter1Value->SetValue(max); } } - return 0; } IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, CheckChanged, CheckBox&, void) diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index 258f19e8b9ff..2b3d22426173 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -101,7 +101,7 @@ void ScSamplingDialog::Init() mpOutputRangeEdit->SetLoseFocusHdl( aLink ); mpOutputRangeButton->SetLoseFocusHdl( aLink ); - Link<> aLink2 = LINK( this, ScSamplingDialog, RefInputModifyHandler); + Link<Edit&,void> aLink2 = LINK( this, ScSamplingDialog, RefInputModifyHandler); mpInputRangeEdit->SetModifyHdl( aLink2); mpOutputRangeEdit->SetModifyHdl( aLink2); @@ -173,7 +173,7 @@ void ScSamplingDialog::SetReference( const ScRange& rReferenceRange, ScDocument* sal_Int64 aSelectedSampleSize = rReferenceRange.aEnd.Row() - rReferenceRange.aStart.Row() + 1; if (aSelectedSampleSize > 1) mpSampleSize->SetValue(aSelectedSampleSize); - SamplingSizeValueModified(NULL); + SamplingSizeValueModified(*mpSampleSize); } } @@ -312,12 +312,11 @@ IMPL_LINK_NOARG_TYPED(ScSamplingDialog, LoseFocusHandler, Control&, void) mDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG(ScSamplingDialog, SamplingSizeValueModified) +IMPL_LINK_NOARG_TYPED(ScSamplingDialog, SamplingSizeValueModified, Edit&, void) { sal_Int64 aPopulationSize = mInputRange.aEnd.Row() - mInputRange.aStart.Row() + 1; if (mpSampleSize->GetValue() > aPopulationSize) mpSampleSize->SetValue(aPopulationSize); - return 0; } IMPL_LINK_NOARG_TYPED(ScSamplingDialog, ToggleSamplingMethod, RadioButton&, void) @@ -339,7 +338,7 @@ void ScSamplingDialog::ToggleSamplingMethod() } } -IMPL_LINK_NOARG(ScSamplingDialog, RefInputModifyHandler) +IMPL_LINK_NOARG_TYPED(ScSamplingDialog, RefInputModifyHandler, Edit&, void) { if ( mpActiveEdit ) { @@ -380,7 +379,7 @@ IMPL_LINK_NOARG(ScSamplingDialog, RefInputModifyHandler) sal_Int64 aSelectedSampleSize = pRange->aEnd.Row() - pRange->aStart.Row() + 1; if (aSelectedSampleSize > 1) mpSampleSize->SetValue(aSelectedSampleSize); - SamplingSizeValueModified(NULL); + SamplingSizeValueModified(*mpSampleSize); // Highlight the resulting range. mpOutputRangeEdit->StartUpdateData(); @@ -397,8 +396,6 @@ IMPL_LINK_NOARG(ScSamplingDialog, RefInputModifyHandler) mpButtonOk->Enable(); else mpButtonOk->Disable(); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx index 276f5c1ba2c1..51d36af4d0ba 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx @@ -125,7 +125,7 @@ void ScStatisticsInputOutputDialog::Init() mpOutputRangeEdit->SetLoseFocusHdl( aLink ); mpOutputRangeButton->SetLoseFocusHdl( aLink ); - Link<> aLink2 = LINK( this, ScStatisticsInputOutputDialog, RefInputModifyHandler); + Link<Edit&,void> aLink2 = LINK( this, ScStatisticsInputOutputDialog, RefInputModifyHandler); mpInputRangeEdit->SetModifyHdl( aLink2); mpOutputRangeEdit->SetModifyHdl( aLink2); @@ -224,7 +224,7 @@ IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, GroupByChanged, RadioButto mGroupedBy = BY_ROW; } -IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, RefInputModifyHandler ) +IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, RefInputModifyHandler, Edit&, void ) { if ( mpActiveEdit ) { @@ -276,8 +276,6 @@ IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, RefInputModifyHandler ) mpButtonOk->Enable(); else mpButtonOk->Disable(); - - return 0; } void ScStatisticsInputOutputDialog::CalculateInputAndWriteToOutput() diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx index 16816f5a0f89..b6376a564c1f 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx @@ -111,7 +111,7 @@ void ScStatisticsTwoVariableDialog::Init() mpOutputRangeEdit->SetLoseFocusHdl( aLink ); mpOutputRangeButton->SetLoseFocusHdl( aLink ); - Link<> aLink2 = LINK( this, ScStatisticsTwoVariableDialog, RefInputModifyHandler); + Link<Edit&,void> aLink2 = LINK( this, ScStatisticsTwoVariableDialog, RefInputModifyHandler); mpVariable1RangeEdit->SetModifyHdl( aLink2); mpVariable2RangeEdit->SetModifyHdl( aLink2); mpOutputRangeEdit->SetModifyHdl( aLink2); @@ -247,7 +247,7 @@ IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, GroupByChanged, RadioButto mGroupedBy = BY_ROW; } -IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, RefInputModifyHandler ) +IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, RefInputModifyHandler, Edit&, void ) { if ( mpActiveEdit ) { @@ -315,8 +315,6 @@ IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, RefInputModifyHandler ) mpButtonOk->Enable(); else mpButtonOk->Disable(); - - return 0; } void ScStatisticsTwoVariableDialog::CalculateInputAndWriteToOutput() diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 09e608e38a25..f4c51a2ebd0f 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1215,7 +1215,7 @@ IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, TriStateHdl, Button*, void) mePrevToggleAllState = maChkToggleAll->GetState(); } -IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl) +IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, EdModifyHdl, Edit&, void) { OUString aSearchText = maEdSearch->GetText(); aSearchText = aSearchText.toAsciiLowerCase(); @@ -1254,8 +1254,6 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl) maChkToggleAll->SetState( TRISTATE_FALSE ); else maChkToggleAll->SetState( TRISTATE_INDET ); - - return 0; } IMPL_LINK_TYPED( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks, void ) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 540bfdea18db..91136716e8bc 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -769,19 +769,18 @@ OUString ScCondFormatDlg::GenerateXmlString(sal_uInt32 nIndex, sal_uInt8 nType, } -IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit*, pEdit ) +IMPL_LINK_TYPED( ScCondFormatDlg, EdRangeModifyHdl, Edit&, rEdit, void ) { - OUString aRangeStr = pEdit->GetText(); + OUString aRangeStr = rEdit.GetText(); ScRangeList aRange; sal_uInt16 nFlags = aRange.Parse(aRangeStr, mpViewData->GetDocument(), SCA_VALID, mpViewData->GetDocument()->GetAddressConvention()); if(nFlags & SCA_VALID) - pEdit->SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor()); + rEdit.SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor()); else - pEdit->SetControlBackground(COL_LIGHTRED); + rEdit.SetControlBackground(COL_LIGHTRED); updateTitle(); - return 0; } IMPL_LINK_TYPED( ScCondFormatDlg, RangeGetFocusHdl, Control&, rControl, void ) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 120e1d633a0d..5edd574fd269 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -224,15 +224,15 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( vcl::Window* pParent, ScDocument* pD maEdVal1->Show(); maEdVal1->SetText(pFormatEntry->GetExpression(maPos, 0)); maEdVal2->Hide(); - OnEdChanged(maEdVal1); + OnEdChanged(*maEdVal1); break; case 2: maEdVal1->Show(); maEdVal1->SetText(pFormatEntry->GetExpression(maPos, 0)); - OnEdChanged(maEdVal1); + OnEdChanged(*maEdVal1); maEdVal2->Show(); maEdVal2->SetText(pFormatEntry->GetExpression(maPos, 1)); - OnEdChanged(maEdVal2); + OnEdChanged(*maEdVal2); break; } } @@ -296,14 +296,14 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const return pEntry; } -IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit) +IMPL_LINK_TYPED(ScConditionFrmtEntry, OnEdChanged, Edit&, rEdit, void) { - OUString aFormula = pEdit->GetText(); + OUString aFormula = rEdit.GetText(); if( aFormula.isEmpty() ) { maFtVal->SetText(ScGlobal::GetRscString(STR_ENTER_VALUE)); - return 0; + return; } ScCompiler aComp( mpDoc, maPos ); @@ -313,9 +313,9 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit) // Error, warn the user if( ta->GetCodeError() || ( ta->GetLen() == 0 ) ) { - pEdit->SetControlBackground(COL_LIGHTRED); + rEdit.SetControlBackground(COL_LIGHTRED); maFtVal->SetText(ScGlobal::GetRscString(STR_VALID_DEFERROR)); - return 0; + return; } // Recognized col/row name or string token, warn the user @@ -326,14 +326,13 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit) ( ( op == ocBad ) && ( t == formula::svString ) ) ) { - pEdit->SetControlBackground(COL_YELLOW); + rEdit.SetControlBackground(COL_YELLOW); maFtVal->SetText(ScGlobal::GetRscString(STR_UNQUOTED_STRING)); - return 0; + return; } - pEdit->SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor()); + rEdit.SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor()); maFtVal->SetText(""); - return 0; } void ScConditionFrmtEntry::Select() diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 7ef844199185..447354633405 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -682,10 +682,9 @@ IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, SourceListSelected, ListBox&, void) UpdateSourceRange(); } -IMPL_LINK_NOARG(ScPivotLayoutDialog, SourceEditModified) +IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, SourceEditModified, Edit&, void) { UpdateSourceRange(); - return 0; } IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, ToggleSource, RadioButton&, void) diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 16b2f0c52b06..0d8f58910ae3 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -225,7 +225,7 @@ void ScConsolidateDlg::Init() } FillAreaLists(); - ModifyHdl( pEdDestArea ); + ModifyHdl( *pEdDestArea ); pLbDataArea->SelectEntryPos( 0 ); pEdDataArea->SetText(OUString()); pEdDataArea->GrabFocus(); @@ -280,7 +280,7 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) aStr = rRef.aStart.Format(nFmt, pDocP, eConv); pRefInputEdit->SetRefString( aStr ); - ModifyHdl( pRefInputEdit ); + ModifyHdl( *pRefInputEdit ); } } @@ -298,7 +298,7 @@ void ScConsolidateDlg::SetActive() if ( pRefInputEdit ) { pRefInputEdit->GrabFocus(); - ModifyHdl( pRefInputEdit ); + ModifyHdl( *pRefInputEdit ); } } else @@ -524,11 +524,11 @@ IMPL_LINK_TYPED( ScConsolidateDlg, SelectHdl, ListBox&, rLb, void ) } } -IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd ) +IMPL_LINK_TYPED( ScConsolidateDlg, ModifyHdl, Edit&, rEd, void ) { - if ( pEd == pEdDataArea ) + if ( &rEd == pEdDataArea ) { - OUString aAreaStr( pEd->GetText() ); + OUString aAreaStr( rEd.GetText() ); if ( !aAreaStr.isEmpty() ) { pBtnAdd->Enable(); @@ -536,11 +536,10 @@ IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd ) else pBtnAdd->Disable(); } - else if ( pEd == pEdDestArea ) + else if ( &rEd == pEdDestArea ) { pLbDestArea->SelectEntryPos(0); } - return 0; } // TODO: generalize! diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index f35e7649b518..211a52216fad 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -266,7 +266,7 @@ void ScDbNameDlg::Init() m_pEdName->GrabFocus(); bSaved = true; pSaveObj->Save(); - NameModifyHdl( 0 ); + NameModifyHdl( *m_pEdName ); } void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData ) @@ -481,7 +481,7 @@ IMPL_LINK_NOARG_TYPED(ScDbNameDlg, AddBtnHdl, Button*, void) theCurArea = ScRange(); bSaved = true; pSaveObj->Save(); - NameModifyHdl( 0 ); + NameModifyHdl( *m_pEdName ); } else { @@ -560,12 +560,12 @@ IMPL_LINK_NOARG_TYPED(ScDbNameDlg, RemoveBtnHdl, Button*, void) SetInfoStrings( NULL ); // leer bSaved=false; pSaveObj->Restore(); - NameModifyHdl( 0 ); + NameModifyHdl( *m_pEdName ); } } } -IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl) +IMPL_LINK_NOARG_TYPED(ScDbNameDlg, NameModifyHdl, Edit&, void) { OUString theName = m_pEdName->GetText(); bool bNameFound = (COMBOBOX_ENTRY_NOTFOUND @@ -626,10 +626,9 @@ IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl) //SFX_APPWINDOW->Enable(); bRefInputMode = true; } - return 0; } -IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl) +IMPL_LINK_NOARG_TYPED(ScDbNameDlg, AssModifyHdl, Edit&, void) { // hier parsen fuer Save() etc. @@ -660,8 +659,6 @@ IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl) m_pFTSource->Disable(); m_pFTOperations->Disable(); } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 009b84b39bf3..a43f66c08b1d 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -451,7 +451,7 @@ void ScFilterDlg::SetActive() if ( bRefInputMode ) { pEdCopyArea->GrabFocus(); - ((Link<>&)pEdCopyArea->GetModifyHdl()).Call( pEdCopyArea ); + pEdCopyArea->GetModifyHdl().Call( *pEdCopyArea ); } else GrabFocus(); @@ -1051,91 +1051,87 @@ IMPL_LINK_TYPED( ScFilterDlg, CheckBoxHdl, Button*, pBox, void ) } } -IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) +IMPL_LINK_TYPED( ScFilterDlg, ValModifyHdl, Edit&, rEd, void ) { size_t nOffset = GetSliderPos(); size_t i = 0; size_t nQE = i + nOffset; - if ( pEd ) + OUString aStrVal = rEd.GetText(); + ListBox* pLbCond = pLbCond1; + ListBox* pLbField = pLbField1; + if ( &rEd == pEdVal2 ) { - OUString aStrVal = pEd->GetText(); - ListBox* pLbCond = pLbCond1; - ListBox* pLbField = pLbField1; - if ( pEd == pEdVal2 ) - { - pLbCond = pLbCond2; - pLbField = pLbField2; - i=1; - nQE=i+nOffset; - } - if ( pEd == pEdVal3 ) + pLbCond = pLbCond2; + pLbField = pLbField2; + i=1; + nQE=i+nOffset; + } + if ( &rEd == pEdVal3 ) + { + pLbCond = pLbCond3; + pLbField = pLbField3; + i=2; + nQE=i+nOffset; + } + if ( &rEd == pEdVal4 ) + { + pLbCond = pLbCond4; + pLbField = pLbField4; + i=3; + nQE=i+nOffset; + } + + if ( aStrEmpty.equals(aStrVal) || aStrNotEmpty.equals(aStrVal) ) + { + pLbCond->SelectEntry(OUString('=')); + pLbCond->Disable(); + } + else + pLbCond->Enable(); + + if (maHasDates.size() < nQE + 1) + maHasDates.resize(nQE + 1, false); + if (maRefreshExceptQuery.size() < nQE + 1) + maRefreshExceptQuery.resize(nQE + 1, false); + + ScQueryEntry& rEntry = theQueryData.GetEntry( nQE ); + ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); + bool bDoThis = (pLbField->GetSelectEntryPos() != 0); + rEntry.bDoQuery = bDoThis; + + if ( rEntry.bDoQuery || maRefreshExceptQuery[nQE] ) + { + bool bByEmptyOrNotByEmpty = false; + if ( aStrEmpty.equals(aStrVal) ) { - pLbCond = pLbCond3; - pLbField = pLbField3; - i=2; - nQE=i+nOffset; + bByEmptyOrNotByEmpty = true; + rEntry.SetQueryByEmpty(); } - if ( pEd == pEdVal4 ) + else if ( aStrNotEmpty.equals(aStrVal) ) { - pLbCond = pLbCond4; - pLbField = pLbField4; - i=3; - nQE=i+nOffset; - } - - if ( aStrEmpty.equals(aStrVal) || aStrNotEmpty.equals(aStrVal) ) - { - pLbCond->SelectEntry(OUString('=')); - pLbCond->Disable(); + bByEmptyOrNotByEmpty = true; + rEntry.SetQueryByNonEmpty(); } else - pLbCond->Enable(); - - if (maHasDates.size() < nQE + 1) - maHasDates.resize(nQE + 1, false); - if (maRefreshExceptQuery.size() < nQE + 1) - maRefreshExceptQuery.resize(nQE + 1, false); - - ScQueryEntry& rEntry = theQueryData.GetEntry( nQE ); - ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); - bool bDoThis = (pLbField->GetSelectEntryPos() != 0); - rEntry.bDoQuery = bDoThis; - - if ( rEntry.bDoQuery || maRefreshExceptQuery[nQE] ) { - bool bByEmptyOrNotByEmpty = false; - if ( aStrEmpty.equals(aStrVal) ) - { - bByEmptyOrNotByEmpty = true; - rEntry.SetQueryByEmpty(); - } - else if ( aStrNotEmpty.equals(aStrVal) ) - { - bByEmptyOrNotByEmpty = true; - rEntry.SetQueryByNonEmpty(); - } - else - { - rItem.maString = pDoc->GetSharedStringPool().intern(aStrVal); - rItem.mfVal = 0.0; + rItem.maString = pDoc->GetSharedStringPool().intern(aStrVal); + rItem.mfVal = 0.0; - sal_uInt32 nIndex = 0; - bool bNumber = pDoc->GetFormatTable()->IsNumberFormat( - rItem.maString.getString(), nIndex, rItem.mfVal); - rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString; - } + sal_uInt32 nIndex = 0; + bool bNumber = pDoc->GetFormatTable()->IsNumberFormat( + rItem.maString.getString(), nIndex, rItem.mfVal); + rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString; + } - const sal_Int32 nField = pLbField->GetSelectEntryPos(); - rEntry.nField = nField ? (theQueryData.nCol1 + - static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0); + const sal_Int32 nField = pLbField->GetSelectEntryPos(); + rEntry.nField = nField ? (theQueryData.nCol1 + + static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0); - ScQueryOp eOp = (ScQueryOp)pLbCond->GetSelectEntryPos(); - rEntry.eOp = eOp; - if (maHasDates[nQE] && !bByEmptyOrNotByEmpty) - rItem.meType = ScQueryEntry::ByDate; - } + ScQueryOp eOp = (ScQueryOp)pLbCond->GetSelectEntryPos(); + rEntry.eOp = eOp; + if (maHasDates[nQE] && !bByEmptyOrNotByEmpty) + rItem.meType = ScQueryEntry::ByDate; } - return 0; } IMPL_LINK_NOARG_TYPED(ScFilterDlg, ScrollHdl, ScrollBar*, void) diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 847b5b737b0f..8d3b82a0aa48 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -174,7 +174,7 @@ void ScFilterOptionsMgr::Init() pBtnCopyResult->Check(); pEdCopyArea->SetText( aString ); - EdAreaModifyHdl( pEdCopyArea ); + EdAreaModifyHdl( *pEdCopyArea ); pLbCopyArea->Enable(); pEdCopyArea->Enable(); pRbCopyArea->Enable(); @@ -223,11 +223,11 @@ IMPL_LINK_TYPED( ScFilterOptionsMgr, LbAreaSelHdl, ListBox&, rLb, void ) } } -IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) +IMPL_LINK_TYPED( ScFilterOptionsMgr, EdAreaModifyHdl, Edit&, rEd, void ) { - if ( pEd == pEdCopyArea ) + if ( &rEd == pEdCopyArea ) { - OUString theCurPosStr = pEd->GetText(); + OUString theCurPosStr = rEd.GetText(); sal_uInt16 nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); if ( SCA_VALID == (nResult & SCA_VALID) ) @@ -240,15 +240,13 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) if (theCurPosStr == *pStr) { pLbCopyArea->SelectEntryPos( i ); - return 0; + return; } } } pLbCopyArea->SelectEntryPos( 0 ); } - - return 0; } IMPL_LINK_TYPED( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox&, rBox, void ) diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 1b3a155a0752..ba3e1ccbb392 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -539,29 +539,24 @@ IMPL_LINK_TYPED( ScPivotFilterDlg, CheckBoxHdl, Button*, pBox, void ) } } -IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) +IMPL_LINK_TYPED( ScPivotFilterDlg, ValModifyHdl, Edit&, rEd, void ) { - if ( pEd ) - { - OUString aStrVal = pEd->GetText(); - ListBox* pLb = m_pLbCond1; + OUString aStrVal = rEd.GetText(); + ListBox* pLb = m_pLbCond1; - if ( pEd == m_pEdVal2 ) pLb = m_pLbCond2; - else if ( pEd == m_pEdVal3 ) pLb = m_pLbCond3; + if ( &rEd == m_pEdVal2 ) pLb = m_pLbCond2; + else if ( &rEd == m_pEdVal3 ) pLb = m_pLbCond3; - // if ond of the special values "empty"/"non-empty" was chosen only the - // =-operand makes sense: + // if ond of the special values "empty"/"non-empty" was chosen only the + // =-operand makes sense: - if ( aStrEmpty.equals(aStrVal) || aStrNotEmpty.equals(aStrVal) ) - { - pLb->SelectEntry(OUString('=')); - pLb->Disable(); - } - else - pLb->Enable(); + if ( aStrEmpty.equals(aStrVal) || aStrNotEmpty.equals(aStrVal) ) + { + pLb->SelectEntry(OUString('=')); + pLb->Disable(); } - - return 0; + else + pLb->Enable(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index cc2635c42cc8..101e6a6e5c43 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -370,7 +370,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa lcl_FillCombo( *pCbTextSep, aTextSepList, mcTextSep ); pCbTextSep->SetText( sTextSeparators ); - Link<> aSeparatorHdl = LINK( this, ScImportAsciiDlg, SeparatorHdl ); + Link<Edit&,void> aSeparatorHdl = LINK( this, ScImportAsciiDlg, SeparatorEditHdl ); Link<Button*,void> aSeparatorClickHdl =LINK( this, ScImportAsciiDlg, SeparatorClickHdl ); pCbTextSep->SetSelectHdl( LINK( this, ScImportAsciiDlg, SeparatorComboBoxHdl ) ); pCbTextSep->SetModifyHdl( aSeparatorHdl ); @@ -684,7 +684,11 @@ IMPL_LINK_TYPED( ScImportAsciiDlg, SeparatorComboBoxHdl, ComboBox&, rCtrl, void { SeparatorHdl(&rCtrl); } -IMPL_LINK( ScImportAsciiDlg, SeparatorHdl, Control*, pCtrl ) +IMPL_LINK_TYPED( ScImportAsciiDlg, SeparatorEditHdl, Edit&, rEdit, void ) +{ + SeparatorHdl(&rEdit); +} +void ScImportAsciiDlg::SeparatorHdl( Control* pCtrl ) { OSL_ENSURE( pCtrl, "ScImportAsciiDlg::SeparatorHdl - missing sender" ); OSL_ENSURE( !pRbFixed->IsChecked(), "ScImportAsciiDlg::SeparatorHdl - not allowed in fixed width" ); @@ -706,7 +710,6 @@ IMPL_LINK( ScImportAsciiDlg, SeparatorHdl, Control*, pCtrl ) UpdateVertical(); mpTableBox->Execute( CSVCMD_NEWCELLTEXTS ); - return 0; } IMPL_LINK_TYPED( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void ) @@ -726,11 +729,10 @@ IMPL_LINK_TYPED( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void ) } } -IMPL_LINK( ScImportAsciiDlg, FirstRowHdl, NumericField*, pNumField ) +IMPL_LINK_TYPED( ScImportAsciiDlg, FirstRowHdl, Edit&, rEdit, void ) { - OSL_ENSURE( pNumField, "ScImportAsciiDlg::FirstRowHdl - missing sender" ); - mpTableBox->Execute( CSVCMD_SETFIRSTIMPORTLINE, sal::static_int_cast<sal_Int32>( pNumField->GetValue() - 1 ) ); - return 0; + NumericField& rNumField = static_cast<NumericField&>(rEdit); + mpTableBox->Execute( CSVCMD_SETFIRSTIMPORTLINE, sal::static_int_cast<sal_Int32>( rNumField.GetValue() - 1 ) ); } IMPL_LINK_TYPED( ScImportAsciiDlg, LbColTypeHdl, ListBox&, rListBox, void ) diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 560391eb5fa8..45909ce90ecd 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -252,12 +252,12 @@ void ScSpecialFilterDlg::SetActive() if ( pRefInputEdit == pEdCopyArea ) { pEdCopyArea->GrabFocus(); - ((Link<>&)pEdCopyArea->GetModifyHdl()).Call( pEdCopyArea ); + pEdCopyArea->GetModifyHdl().Call( *pEdCopyArea ); } else if ( pRefInputEdit == pEdFilterArea ) { pEdFilterArea->GrabFocus(); - FilterAreaModHdl( pEdFilterArea ); + FilterAreaModHdl( *pEdFilterArea ); } } else @@ -438,13 +438,13 @@ IMPL_LINK_TYPED( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void ) } } -IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) +IMPL_LINK_TYPED( ScSpecialFilterDlg, FilterAreaModHdl, Edit&, rEd, void ) { - if ( pEd == pEdFilterArea ) + if ( &rEd == pEdFilterArea ) { if ( pDoc && pViewData ) { - OUString theCurAreaStr = pEd->GetText(); + OUString theCurAreaStr = rEd.GetText(); sal_uInt16 nResult = ScRange().Parse( theCurAreaStr, pDoc ); if ( SCA_VALID == (nResult & SCA_VALID) ) @@ -457,7 +457,7 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) if (theCurAreaStr == *pStr) { pLbFilterArea->SelectEntryPos( i ); - return 0; + return; } } pLbFilterArea->SelectEntryPos( 0 ); @@ -466,8 +466,6 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) else pLbFilterArea->SelectEntryPos( 0 ); } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 779211428774..da95ea9bcac4 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -95,7 +95,7 @@ private: DECL_LINK_TYPED(ToggleSource, RadioButton&, void); DECL_LINK_TYPED(ToggleDestination, RadioButton&, void); DECL_LINK_TYPED(SourceListSelected, ListBox&, void); - DECL_LINK(SourceEditModified, void*); + DECL_LINK_TYPED(SourceEditModified, Edit&, void); void ToggleSource(); void ToggleDestination(); virtual bool Close() override; diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 9aed84462d8d..4dd9c4b10b2a 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -76,9 +76,9 @@ private: DECL_LINK_TYPED( GetFocusHandler, Control&, void ); DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK( InputRangeModified, void* ); - DECL_LINK( Parameter1ValueModified, void* ); - DECL_LINK( Parameter2ValueModified, void* ); + DECL_LINK_TYPED( InputRangeModified, Edit&, void ); + DECL_LINK_TYPED( Parameter1ValueModified, Edit&, void ); + DECL_LINK_TYPED( Parameter2ValueModified, Edit&, void ); DECL_LINK_TYPED( DistributionChanged, ListBox&, void ); DECL_LINK_TYPED( CheckChanged, CheckBox&, void ); diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index f61c4a6975cb..ea1d698f28e3 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -75,9 +75,9 @@ private: DECL_LINK_TYPED( OkClicked, Button*, void ); DECL_LINK_TYPED( GetFocusHandler, Control&, void ); DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK( SamplingSizeValueModified, void* ); + DECL_LINK_TYPED( SamplingSizeValueModified, Edit&, void ); DECL_LINK_TYPED( ToggleSamplingMethod, RadioButton&, void ); - DECL_LINK( RefInputModifyHandler, void* ); + DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); void ToggleSamplingMethod(); }; diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index 856f5d160574..874358abcb1e 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -83,7 +83,7 @@ private: DECL_LINK_TYPED( OkClicked, Button*, void ); DECL_LINK_TYPED( GetFocusHandler, Control&, void ); DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK( RefInputModifyHandler, void* ); + DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index fec0cbc7dfb5..41c0df053447 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -86,7 +86,7 @@ private: DECL_LINK_TYPED( OkClicked, Button*, void ); DECL_LINK_TYPED( GetFocusHandler, Control&, void ); DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK( RefInputModifyHandler, void* ); + DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index e7eb5aaf6118..64f9ce094cbf 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -74,7 +74,7 @@ private: // Handler: DECL_LINK_TYPED( Impl_SelectHdl, ListBox&, void ); - DECL_LINK( Impl_ModifyHdl, formula::RefEdit* ); + DECL_LINK_TYPED( Impl_ModifyHdl, Edit&, void ); DECL_LINK_TYPED( Impl_BtnHdl, Button*, void ); DECL_LINK_TYPED( Impl_GetFocusHdl, Control&, void ); }; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index cc93b4d1a36b..fdfc94a8aeec 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -331,7 +331,7 @@ private: DECL_LINK_TYPED( ButtonHdl, Button*, void ); DECL_LINK_TYPED( TriStateHdl, Button*, void ); DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); - DECL_LINK( EdModifyHdl, void* ); + DECL_LINK_TYPED( EdModifyHdl, Edit&, void ); private: VclPtr<Edit> maEdSearch; diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index be0eaadd0f86..6d9f3aec8c20 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -119,7 +119,7 @@ private: OUString msBaseTitle; void updateTitle(); - DECL_LINK( EdRangeModifyHdl, Edit* ); + DECL_LINK_TYPED( EdRangeModifyHdl, Edit&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index a5e672b977bb..876faa617d47 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -102,7 +102,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener void Init(ScCondFormatDlg* pDialogParent); DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); DECL_LINK_TYPED( ConditionTypeSelectHdl, ListBox&, void ); - DECL_LINK( OnEdChanged, Edit* ); + DECL_LINK_TYPED( OnEdChanged, Edit&, void ); // Searches the lookup table for the entry position, given condition mode static sal_Int32 ConditionModeToEntryPos( ScConditionMode eMode ); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index afbc2765a161..52cb7179bcbf 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -94,7 +94,7 @@ private: DECL_LINK_TYPED( OkHdl, Button*, void ); DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK( ModifyHdl, formula::RefEdit* ); + DECL_LINK_TYPED( ModifyHdl, Edit&, void ); DECL_LINK_TYPED( SelectHdl, ListBox&, void ); static ScSubTotalFunc LbPosToFunc( sal_Int32 nPos ); diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index f4ab74404253..a7734c027a69 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -82,10 +82,10 @@ private: DECL_LINK_TYPED( AddBtnHdl, Button*, void ); DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); DECL_LINK_TYPED( Range1SelectHdl, ListBox&, void ); - DECL_LINK( Range1DataModifyHdl, void * ); + DECL_LINK_TYPED( Range1DataModifyHdl, Edit&, void ); DECL_LINK_TYPED( ColClickHdl, Button*, void ); DECL_LINK_TYPED( RowClickHdl, Button*, void ); - DECL_LINK( Range2DataModifyHdl, void * ); + DECL_LINK_TYPED( Range2DataModifyHdl, Edit&, void ); DECL_LINK_TYPED( GetFocusHdl, Control&, void ); DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); }; diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 8de53cd4ff99..ca69b539a47b 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -72,7 +72,7 @@ private: DECL_LINK_TYPED(Impl_CloseHdl, Button*, void); DECL_LINK_TYPED(Impl_ScrollHdl, ScrollBar*, void); - DECL_LINK( Impl_DataModifyHdl, Edit* ); + DECL_LINK_TYPED(Impl_DataModifyHdl, Edit&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_DATAFDLG_HXX diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index 1dc37b0ee05e..6ea9c14436e2 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -48,7 +48,7 @@ class DataStreamDlg : public ModalDialog VclPtr<VclFrame> m_pVclFrameMove; DECL_LINK_TYPED(UpdateClickHdl, Button*, void); - DECL_LINK(UpdateHdl, void*); + DECL_LINK_TYPED(UpdateHdl, Edit&, void); DECL_LINK_TYPED(UpdateComboBoxHdl, ComboBox&, void); DECL_LINK_TYPED(BrowseHdl, Button*, void); diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 96756c891717..0a053c112942 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -95,8 +95,8 @@ private: DECL_LINK_TYPED( OkBtnHdl, Button*, void ); DECL_LINK_TYPED( AddBtnHdl, Button*, void ); DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); - DECL_LINK( NameModifyHdl, void * ); - DECL_LINK( AssModifyHdl, void * ); + DECL_LINK_TYPED( NameModifyHdl, Edit&, void ); + DECL_LINK_TYPED( AssModifyHdl, Edit&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_DBNAMDLG_HXX diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 0f0c0bcd560b..a2e40146c105 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -146,7 +146,7 @@ private: // Handler: DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); - DECL_LINK( ValModifyHdl, ComboBox* ); + DECL_LINK_TYPED( ValModifyHdl, Edit&, void ); DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); DECL_LINK_TYPED( EndDlgHdl, Button*, void ); DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); @@ -214,7 +214,7 @@ private: // Handler DECL_LINK_TYPED( FilterAreaSelHdl, ListBox&, void ); - DECL_LINK( FilterAreaModHdl, formula::RefEdit* ); + DECL_LINK_TYPED( FilterAreaModHdl, Edit&, void ); DECL_LINK_TYPED( EndDlgHdl, Button*, void ); // Hack: RefInput control diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 4016a5b3df4a..4b6a3cac0e32 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -77,7 +77,7 @@ private: void Init(); // Handler: - DECL_LINK( EdAreaModifyHdl, Edit* ); + DECL_LINK_TYPED( EdAreaModifyHdl, Edit&, void ); DECL_LINK_TYPED( LbAreaSelHdl, ListBox&, void ); DECL_LINK_TYPED( BtnCopyResultHdl, CheckBox&, void ); }; diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index b797819a1b50..07a96810085e 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -91,12 +91,12 @@ private: void FillTables_Impl( ScDocument* pSrcDoc ); void DoEnable_Impl(); - DECL_LINK_TYPED(BrowseHdl_Impl, Button*, void); - DECL_LINK_TYPED(ChoiceHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void); - DECL_LINK(CountHdl_Impl, void *); - DECL_LINK_TYPED(DoEnterHdl, Button*, void); - DECL_LINK_TYPED(BrowseTimeoutHdl, Timer *, void); + DECL_LINK_TYPED( BrowseHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ChoiceHdl_Impl, Button*, void ); + DECL_LINK_TYPED( SelectHdl_Impl, ListBox&, void ); + DECL_LINK_TYPED( CountHdl_Impl, Edit&, void ); + DECL_LINK_TYPED( DoEnterHdl, Button*, void ); + DECL_LINK_TYPED( BrowseTimeoutHdl, Timer *, void ); DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); }; diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 686ba94351e6..177024db1df2 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -50,7 +50,7 @@ private: long nCurrentValue; DECL_LINK_TYPED(SetDefValHdl, Button*, void); - DECL_LINK(ModifyHdl, void *); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_MTRINDLG_HXX diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 73b172177a3a..d6fb4fd0f5a2 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -78,7 +78,7 @@ private: DECL_LINK_TYPED( OkHdl, Button*, void ); DECL_LINK_TYPED( SelHdl, ListBox&, void ); DECL_LINK_TYPED( CheckBtnHdl, RadioButton&, void ); - DECL_LINK( CheckNameHdl, Edit * ); + DECL_LINK_TYPED( CheckNameHdl, Edit&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_MVTABDLG_HXX diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index d50b9ad7cd2f..91382fbe82ff 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -66,7 +66,7 @@ private: DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK( NameModifyHdl, void* ); + DECL_LINK_TYPED( NameModifyHdl, Edit&, void ); DECL_LINK_TYPED( AssignGetFocusHdl, Control&, void ); protected: diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index e95aaea9e80e..06fc81606c55 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -104,7 +104,7 @@ private: DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); DECL_LINK_TYPED( AddBtnHdl, Button*, void ); DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); - DECL_LINK( EdModifyHdl, void * ); + DECL_LINK_TYPED( EdModifyHdl, Edit&, void ); DECL_LINK_TYPED( EdModifyCheckBoxHdl, CheckBox&, void ); DECL_LINK_TYPED( AssignGetFocusHdl, Control&, void ); DECL_LINK_TYPED( SelectionChangedHdl_Impl, SvTreeListBox*, void ); diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 81ec6c60cbf3..c96511cf7660 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -196,8 +196,8 @@ private: DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void); DECL_LINK_TYPED( CursorUpHdl, ScCursorRefEdit&, void ); DECL_LINK_TYPED( CursorDownHdl, ScCursorRefEdit&, void ); - DECL_LINK( CondModifyHdl, void* ); - DECL_LINK( TargetModifyHdl, void* ); + DECL_LINK_TYPED( CondModifyHdl, Edit&, void ); + DECL_LINK_TYPED( TargetModifyHdl, Edit&, void ); DECL_LINK_TYPED( SelectHdl, ListBox&, void ); }; diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 61c3969fb25c..3165e8e484be 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -91,7 +91,7 @@ private: // Handler: DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); - DECL_LINK( ValModifyHdl, ComboBox* ); + DECL_LINK_TYPED( ValModifyHdl, Edit&, void ); DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); }; diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index d2f671317d6c..69e8f842eacf 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -66,7 +66,7 @@ private: DECL_LINK_TYPED( OKHdl, Button*, void ); DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK( PasswordModifyHdl, void* ); + DECL_LINK_TYPED( PasswordModifyHdl, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 729658e54737..03b1882648ff 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -134,7 +134,7 @@ private: DECL_LINK_TYPED( OKHdl, Button*, void ); DECL_LINK_TYPED( RadioBtnHdl, Button*, void ); DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK( PasswordModifyHdl, void* ); + DECL_LINK_TYPED( PasswordModifyHdl, Edit&, void ); ScPassHashProtectable* mpProtected; }; diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 802cc68fff8d..8eada1ac8aee 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -101,11 +101,12 @@ private: inline bool Seek( sal_uLong nPos ); // synced to and from mnStreamPos DECL_LINK_TYPED( CharSetHdl, ListBox&, void ); - DECL_LINK( FirstRowHdl, NumericField* ); + DECL_LINK_TYPED( FirstRowHdl, Edit&, void ); DECL_LINK_TYPED( RbSepFixHdl, Button*, void ); - DECL_LINK( SeparatorHdl, Control* ); + DECL_LINK_TYPED( SeparatorEditHdl, Edit&, void ); DECL_LINK_TYPED( SeparatorClickHdl, Button*, void ); DECL_LINK_TYPED( SeparatorComboBoxHdl, ComboBox&, void ); + void SeparatorHdl(Control*); DECL_LINK_TYPED( LbColTypeHdl, ListBox&, void ); DECL_LINK_TYPED( UpdateTextHdl, ScCsvTableBox&, void ); DECL_LINK_TYPED( ColTypeHdl, ScCsvTableBox&, void ); diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 4e7b8ab0e39c..335b1b0b05d8 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -35,8 +35,8 @@ private: void CheckPrefix(Edit* pEdit); void OnFocusPrefixInput(Edit* pEdit); - DECL_LINK(NumModifiedHdl, void *); - DECL_LINK( PrefixModifiedHdl, Edit* ); + DECL_LINK_TYPED( NumModifiedHdl, Edit&, void ); + DECL_LINK_TYPED( PrefixModifiedHdl, Edit&, void ); DECL_LINK_TYPED( PrefixEditOnFocusHdl, Control&, void ); private: diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 0334ebf51e7c..098a1589fbf2 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -53,7 +53,7 @@ private: bool IsValidSeparatorSet() const; DECL_LINK_TYPED( ButtonHdl, Button*, void ); - DECL_LINK( SepModifyHdl, Edit* ); + DECL_LINK_TYPED( SepModifyHdl, Edit&, void ); DECL_LINK_TYPED( SepEditOnFocusHdl, Control&, void ); private: diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 4f10fd409ea0..3e4a1b8d3c30 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -97,7 +97,7 @@ private: // Handler: DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); DECL_LINK_TYPED( BtnClickHdl, Button*, void ); - DECL_LINK( EdEntriesModHdl, VclMultiLineEdit* ); + DECL_LINK_TYPED( EdEntriesModHdl, Edit&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPUSRLST_HXX diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 4555d02b3680..ab8b859c3e4e 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -97,7 +97,7 @@ private: DECL_LINK_TYPED(GetFocusHdl, Control&, void); DECL_LINK_TYPED(BtnPressedHdl, Button*, void); DECL_LINK_TYPED(TreeItemSelectHdl, SvTreeListBox*, void); - DECL_LINK(RefModifiedHdl, void*); + DECL_LINK_TYPED(RefModifiedHdl, Edit&, void); }; #endif diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 169e4bf05acf..9fde83cf8d42 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -338,9 +338,9 @@ void ScColRowNameRangesDlg::SetActive() GrabFocus(); if( pEdActive == pEdAssign ) - Range1DataModifyHdl( 0 ); + Range1DataModifyHdl( *pEdAssign ); else if( pEdActive == pEdAssign2 ) - Range2DataModifyHdl( 0 ); + Range2DataModifyHdl( *pEdAssign2 ); RefInputDone(); } @@ -705,7 +705,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void) } // handler called when the label range has changed -IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range1DataModifyHdl, Edit&, void) { OUString aNewArea( pEdAssign->GetText() ); bool bValid = false; @@ -735,11 +735,10 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl) pRbAssign2->Disable(); } pBtnRemove->Disable(); - return 0; } // handler called when the data range has changed -IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range2DataModifyHdl, Edit&, void) { OUString aNewData( pEdAssign2->GetText() ); if ( !aNewData.isEmpty() ) @@ -757,7 +756,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl) { pBtnAdd->Disable(); } - return 0; } // handler for the radio button for columns, adjust ranges diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 8c095bcfa434..32c6dd94504e 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -251,11 +251,10 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/) m_pSlider->SetThumbPos(nCurrentRow-nStartRow-1); } -IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit*, pEdit) +IMPL_LINK_TYPED( ScDataFormDlg, Impl_DataModifyHdl, Edit&, rEdit, void) { - if ( pEdit->IsModified() ) + if ( rEdit.IsModified() ) m_pBtnRestore->Enable( true ); - return 0; } IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NewHdl, Button*, void) diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index c453f941cc7b..5aa18913cd82 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -97,10 +97,9 @@ IMPL_LINK_NOARG_TYPED(DataStreamDlg, UpdateComboBoxHdl, ComboBox&, void) { UpdateEnable(); } -IMPL_LINK_NOARG(DataStreamDlg, UpdateHdl) +IMPL_LINK_NOARG_TYPED(DataStreamDlg, UpdateHdl, Edit&, void) { UpdateEnable(); - return 0; } void DataStreamDlg::UpdateEnable() diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 683ccd3d9dbb..410b27a8a538 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -246,7 +246,7 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) // Handler: -IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) +IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, CountHdl_Impl, Edit&, void) { nTableCount = static_cast<SCTAB>(m_pNfCount->GetValue()); if ( nTableCount==1) @@ -265,7 +265,6 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) } DoEnable_Impl(); - return 0; } IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, ChoiceHdl_Impl, Button*, void) diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 92c39f599d66..cedfcbe1e487 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -107,10 +107,9 @@ IMPL_LINK_NOARG_TYPED(ScMetricInputDlg, SetDefValHdl, Button*, void) m_pEdValue->SetValue( nCurrentValue ); } -IMPL_LINK_NOARG(ScMetricInputDlg, ModifyHdl) +IMPL_LINK_NOARG_TYPED(ScMetricInputDlg, ModifyHdl, Edit&, void) { m_pBtnDefVal->Check( nDefaultValue == m_pEdValue->GetValue() ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index cc7f92ebe6f5..3e3ed9951daa 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -319,15 +319,13 @@ IMPL_LINK_TYPED( ScMoveTableDlg, SelHdl, ListBox&, rLb, void ) } } -IMPL_LINK( ScMoveTableDlg, CheckNameHdl, Edit *, pEdt ) +IMPL_LINK_TYPED( ScMoveTableDlg, CheckNameHdl, Edit&, rEdt, void ) { - if ( pEdt == pEdTabName ) + if ( &rEdt == pEdTabName ) { mbEverEdited = true; CheckNewTabName(); } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 77fb82af60cc..01a7d5e3750c 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -410,7 +410,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) Link<ScCursorRefEdit&,void> aCursorUp = LINK( this, ScOptSolverDlg, CursorUpHdl ); Link<ScCursorRefEdit&,void> aCursorDown = LINK( this, ScOptSolverDlg, CursorDownHdl ); - Link<> aCondModify = LINK( this, ScOptSolverDlg, CondModifyHdl ); + Link<Edit&,void> aCondModify = LINK( this, ScOptSolverDlg, CondModifyHdl ); for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) { mpLeftEdit[nRow]->SetCursorLinks( aCursorUp, aCursorDown ); @@ -699,21 +699,19 @@ IMPL_LINK_TYPED( ScOptSolverDlg, DelBtnHdl, Button*, pBtn, void ) } } -IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl) +IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, TargetModifyHdl, Edit&, void) { // modify handler for the target edit: // select "Value of" if something is input into the edit if ( !m_pEdTargetValue->GetText().isEmpty() ) m_pRbValue->Check(); - return 0; } -IMPL_LINK_NOARG(ScOptSolverDlg, CondModifyHdl) +IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, CondModifyHdl, Edit&, void) { // modify handler for the condition edits, just to enable/disable "delete" buttons ReadConditions(); EnableButtons(); - return 0; } IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, SelectHdl, ListBox&, void) diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index eac9eac93291..bb0860deaaec 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -93,7 +93,7 @@ void ScTableProtectionDlg::Init() m_pBtnOk->SetClickHdl(LINK( this, ScTableProtectionDlg, OKHdl )); - Link<> aLink = LINK( this, ScTableProtectionDlg, PasswordModifyHdl ); + Link<Edit&,void> aLink = LINK( this, ScTableProtectionDlg, PasswordModifyHdl ); m_pPassword1Edit->SetModifyHdl(aLink); m_pPassword2Edit->SetModifyHdl(aLink); @@ -135,12 +135,11 @@ IMPL_LINK_NOARG_TYPED(ScTableProtectionDlg, OKHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG(ScTableProtectionDlg, PasswordModifyHdl) +IMPL_LINK_NOARG_TYPED(ScTableProtectionDlg, PasswordModifyHdl, Edit&, void) { OUString aPass1 = m_pPassword1Edit->GetText(); OUString aPass2 = m_pPassword2Edit->GetText(); m_pBtnOk->Enable(aPass1 == aPass2); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 639f74744d80..1244b093c6a5 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -368,7 +368,7 @@ void ScRetypePassInputDlg::Init() m_pBtnRemovePassword->SetClickHdl(aLink); aLink = LINK( this, ScRetypePassInputDlg, CheckBoxHdl ); m_pBtnMatchOldPass->SetClickHdl(aLink); - Link<> aLink2 = LINK( this, ScRetypePassInputDlg, PasswordModifyHdl ); + Link<Edit&,void> aLink2 = LINK( this, ScRetypePassInputDlg, PasswordModifyHdl ); m_pPassword1Edit->SetModifyHdl(aLink2); m_pPassword2Edit->SetModifyHdl(aLink2); @@ -440,10 +440,9 @@ IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, CheckBoxHdl, Button*, void) CheckPasswordInput(); } -IMPL_LINK_NOARG(ScRetypePassInputDlg, PasswordModifyHdl) +IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, PasswordModifyHdl, Edit&, void) { CheckPasswordInput(); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index ac516d4a1390..fee5baaba4ba 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -337,10 +337,9 @@ IMPL_LINK_NOARG_TYPED(ScNameDefDlg, AddBtnHdl, Button*, void) AddPushed(); }; -IMPL_LINK_NOARG(ScNameDefDlg, NameModifyHdl) +IMPL_LINK_NOARG_TYPED(ScNameDefDlg, NameModifyHdl, Edit&, void) { IsNameValid(); - return 0; } IMPL_LINK_NOARG_TYPED(ScNameDefDlg, AssignGetFocusHdl, Control&, void) diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 7e5fdd9c044b..3138ec047442 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -176,7 +176,7 @@ bool ScNameDlg::IsRefInputMode() const void ScNameDlg::RefInputDone( bool bForced) { ScAnyRefDlg::RefInputDone(bForced); - EdModifyHdl(m_pEdAssign); + EdModifyHdl(*m_pEdAssign); } void ScNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) @@ -508,15 +508,14 @@ IMPL_LINK_NOARG_TYPED(ScNameDlg, EdModifyCheckBoxHdl, CheckBox&, void) NameModified(); } -IMPL_LINK_NOARG(ScNameDlg, EdModifyHdl) +IMPL_LINK_NOARG_TYPED(ScNameDlg, EdModifyHdl, Edit&, void) { NameModified(); - return 0; } IMPL_LINK_NOARG_TYPED(ScNameDlg, AssignGetFocusHdl, Control&, void) { - EdModifyHdl(m_pEdAssign); + EdModifyHdl(*m_pEdAssign); } IMPL_LINK_NOARG_TYPED(ScNameDlg, SelectionChangedHdl_Impl, SvTreeListBox*, void) diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index ee33e899dff9..fb213fcbaac9 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -238,10 +238,9 @@ IMPL_LINK_TYPED(ScCalcOptionsDialog, CBUseOpenCLHdl, Button*, pCheckBox, void) maConfig.mbOpenCLSubsetOnly = static_cast<CheckBox*>(pCheckBox)->IsChecked(); } -IMPL_LINK(ScCalcOptionsDialog, SpinOpenCLMinSizeHdl, NumericField*, pSpin) +IMPL_LINK_TYPED(ScCalcOptionsDialog, SpinOpenCLMinSizeHdl, Edit&, rEdit, void) { - maConfig.mnOpenCLMinimumFormulaGroupSize = pSpin->GetValue(); - return 0; + maConfig.mnOpenCLMinimumFormulaGroupSize = static_cast<NumericField&>(rEdit).GetValue(); } IMPL_LINK_NOARG_TYPED(ScCalcOptionsDialog, BtnAutomaticSelectHdl, RadioButton&, void) @@ -254,10 +253,9 @@ IMPL_LINK_NOARG_TYPED(ScCalcOptionsDialog, DeviceSelHdl, SvTreeListBox*, void) SelectedDeviceChanged(); } -IMPL_LINK(ScCalcOptionsDialog, EditModifiedHdl, Edit*, pCtrl) +IMPL_LINK_TYPED(ScCalcOptionsDialog, EditModifiedHdl, Edit&, rCtrl, void) { - maConfig.mpOpenCLSubsetOpCodes = ScStringToOpCodeSet(pCtrl->GetText()); - return 0; + maConfig.mpOpenCLSubsetOpCodes = ScStringToOpCodeSet(rCtrl.GetText()); } namespace { diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index b06ab7adb55a..fe810fcef3c8 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -40,13 +40,13 @@ public: DECL_LINK_TYPED( BtnAutomaticSelectHdl, RadioButton&, void ); DECL_LINK_TYPED( DeviceSelHdl, SvTreeListBox*, void ); - DECL_LINK( EditModifiedHdl, Edit * ); + DECL_LINK_TYPED( EditModifiedHdl, Edit&, void ); DECL_STATIC_LINK_TYPED( ScCalcOptionsDialog, TestClickHdl, Button*, void ); DECL_LINK_TYPED( AsZeroModifiedHdl, Button*, void); DECL_LINK_TYPED( ConversionModifiedHdl, ListBox&, void); DECL_LINK_TYPED( SyntaxModifiedHdl, ListBox&, void); DECL_LINK_TYPED( CBUseOpenCLHdl, Button*, void); - DECL_LINK( SpinOpenCLMinSizeHdl, NumericField*); + DECL_LINK_TYPED( SpinOpenCLMinSizeHdl, Edit&, void); const ScCalcConfig& GetConfig() const { return maConfig;} diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index ceb39672d224..078829c159b6 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -122,16 +122,14 @@ void ScTpDefaultsOptions::OnFocusPrefixInput(Edit* pEdit) maOldPrefixValue = pEdit->GetText(); } -IMPL_LINK_NOARG(ScTpDefaultsOptions, NumModifiedHdl) +IMPL_LINK_NOARG_TYPED(ScTpDefaultsOptions, NumModifiedHdl, Edit&, void) { CheckNumSheets(); - return 0; } -IMPL_LINK( ScTpDefaultsOptions, PrefixModifiedHdl, Edit*, pEdit ) +IMPL_LINK_TYPED( ScTpDefaultsOptions, PrefixModifiedHdl, Edit&, rEdit, void ) { - CheckPrefix(pEdit); - return 0; + CheckPrefix(&rEdit); } IMPL_LINK_TYPED( ScTpDefaultsOptions, PrefixEditOnFocusHdl, Control&, rControl, void ) diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index c78e1afa8845..e4817d1d1ff7 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -64,7 +64,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& r mpBtnCustomCalcCustom->SetClickHdl(aLink2); mpBtnCustomCalcDetails->SetClickHdl(aLink2); - Link<> aLink = LINK( this, ScTpFormulaOptions, SepModifyHdl ); + Link<Edit&,void> aLink = LINK( this, ScTpFormulaOptions, SepModifyHdl ); mpEdSepFuncArg->SetModifyHdl(aLink); mpEdSepArrayCol->SetModifyHdl(aLink); mpEdSepArrayRow->SetModifyHdl(aLink); @@ -207,26 +207,22 @@ IMPL_LINK_TYPED( ScTpFormulaOptions, ButtonHdl, Button*, pBtn, void ) LaunchCustomCalcSettings(); } -IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, Edit*, pEdit ) +IMPL_LINK_TYPED( ScTpFormulaOptions, SepModifyHdl, Edit&, rEdit, void ) { - if (!pEdit) - return 0; - - OUString aStr = pEdit->GetText(); + OUString aStr = rEdit.GetText(); if (aStr.getLength() > 1) { // In case the string is more than one character long, only grab the // first character. aStr = aStr.copy(0, 1); - pEdit->SetText(aStr); + rEdit.SetText(aStr); } if ((!IsValidSeparator(aStr) || !IsValidSeparatorSet()) && !maOldSepValue.isEmpty()) // Invalid separator. Restore the old value. - pEdit->SetText(maOldSepValue); + rEdit.SetText(maOldSepValue); - OnFocusSeparatorInput(pEdit); - return 0; + OnFocusSeparatorInput(&rEdit); } IMPL_LINK_TYPED( ScTpFormulaOptions, SepEditOnFocusHdl, Control&, rControl, void ) diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 864b871db90b..47db07a3a697 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -708,10 +708,10 @@ IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void ) } } -IMPL_LINK( ScTpUserLists, EdEntriesModHdl, VclMultiLineEdit*, pEd ) +IMPL_LINK_TYPED( ScTpUserLists, EdEntriesModHdl, Edit&, rEd, void ) { - if ( pEd != mpEdEntries ) - return 0; + if ( &rEd != mpEdEntries ) + return; if ( mpBtnCopy->IsEnabled() ) { @@ -753,8 +753,6 @@ IMPL_LINK( ScTpUserLists, EdEntriesModHdl, VclMultiLineEdit*, pEd ) mpBtnModify->Disable(); } } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 5d9c573117f6..ec32d3fd4c33 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -209,7 +209,7 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ lcl_GetRepeatRangeString(&rRef, pDoc, bRow, aStr); pRefInputEdit->SetRefString( aStr ); } - Impl_ModifyHdl( pRefInputEdit ); + Impl_ModifyHdl( *pRefInputEdit ); } } @@ -225,7 +225,7 @@ void ScPrintAreasDlg::AddRefEntry() sal_Int32 nLen = aVal.getLength(); pEdPrintArea->SetSelection( Selection( nLen, nLen ) ); - Impl_ModifyHdl( pEdPrintArea ); + Impl_ModifyHdl( *pEdPrintArea ); } } @@ -243,7 +243,7 @@ void ScPrintAreasDlg::SetActive() if ( pRefInputEdit ) { pRefInputEdit->GrabFocus(); - Impl_ModifyHdl( pRefInputEdit ); + Impl_ModifyHdl( *pRefInputEdit ); } } else @@ -305,9 +305,9 @@ void ScPrintAreasDlg::Impl_Reset() lcl_GetRepeatRangeString(pRepeatColRange, pDoc, false, aStrRange); pEdRepeatCol->SetText( aStrRange ); - Impl_ModifyHdl( pEdPrintArea ); - Impl_ModifyHdl( pEdRepeatRow ); - Impl_ModifyHdl( pEdRepeatCol ); + Impl_ModifyHdl( *pEdPrintArea ); + Impl_ModifyHdl( *pEdRepeatRow ); + Impl_ModifyHdl( *pEdRepeatCol ); if( pDoc->IsPrintEntireSheet( nCurTab ) ) pLbPrintArea->SelectEntryPos( SC_AREASDLG_PR_ENTIRE ); @@ -574,7 +574,7 @@ IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_SelectHdl, ListBox&, rLb, void ) pEd->SetText( *static_cast< OUString* >( pLb->GetEntryData( nSelPos ) ) ); } -IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) +IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_ModifyHdl, Edit&, rEd, void ) { ListBox* pLb = NULL; @@ -582,22 +582,22 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) sal_Int32 nUserDefPos = SC_AREASDLG_RR_USER; sal_Int32 nFirstCustomPos = SC_AREASDLG_RR_OFFSET; - if( pEd == pEdPrintArea ) + if( &rEd == pEdPrintArea ) { pLb = pLbPrintArea; nUserDefPos = SC_AREASDLG_PR_USER; nFirstCustomPos = SC_AREASDLG_PR_SELECT; // "Selection" and following } - else if( pEd == pEdRepeatCol ) + else if( &rEd == pEdRepeatCol ) pLb = pLbRepeatCol; - else if( pEd == pEdRepeatRow ) + else if( &rEd == pEdRepeatRow ) pLb = pLbRepeatRow; else - return 0; + return; // set list box selection according to edit field const sal_Int32 nEntryCount = pLb->GetEntryCount(); - OUString aStrEd( pEd->GetText() ); + OUString aStrEd( rEd.GetText() ); OUString aEdUpper = aStrEd.toAsciiUpperCase(); if ( (nEntryCount > nFirstCustomPos) && !aStrEd.isEmpty() ) @@ -615,8 +615,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) } else pLb->SelectEntryPos( !aStrEd.isEmpty() ? nUserDefPos : 0 ); - - return 0; } // globale Funktionen: diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index bbe7da3eb5cd..a317ccfda475 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -107,7 +107,7 @@ void AlignmentPropertyPanel::Initialize() mpFTLeftIndent->Disable(); mpMFLeftIndent->Disable(); mpMFLeftIndent->SetAccessibleName(OUString( "Left Indent")); //wj acc - Link<> aLink = LINK(this, AlignmentPropertyPanel, MFLeftIndentMdyHdl); + Link<Edit&,void> aLink = LINK(this, AlignmentPropertyPanel, MFLeftIndentMdyHdl); mpMFLeftIndent->SetModifyHdl ( aLink ); mpCBXMergeCell->SetClickHdl ( LINK(this, AlignmentPropertyPanel, CBOXMergnCellClkHdl) ); @@ -152,21 +152,21 @@ IMPL_LINK_TYPED( AlignmentPropertyPanel, ReferenceEdgeHdl, Button*, pControl, vo GetBindings()->GetDispatcher()->Execute(SID_ATTR_ALIGN_LOCKPOS, SfxCallMode::RECORD, &aItem, 0l); } -IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl ) +IMPL_LINK_NOARG_TYPED( AlignmentPropertyPanel, AngleModifiedHdl, Edit&, void ) { OUString sTmp = mpMtrAngle->GetText(); if (sTmp.isEmpty()) - return 0; + return; sal_Unicode nChar = sTmp[0]; if( nChar == '-' ) { if (sTmp.getLength() < 2) - return 0; + return; nChar = sTmp[1]; } if( (nChar < '0') || (nChar > '9') ) - return 0; + return; const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0]; @@ -179,7 +179,7 @@ IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl ) rtl_math_ConversionStatus eStatus; double fTmp = rtl::math::stringToDouble( sTmp, cSep, 0, &eStatus); if (eStatus != rtl_math_ConversionStatus_Ok) - return 0; + return; FormatDegrees(fTmp); @@ -188,7 +188,6 @@ IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl ) GetBindings()->GetDispatcher()->Execute( SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, &aAngleItem, 0L ); - return 0; } IMPL_LINK_NOARG_TYPED( AlignmentPropertyPanel, ClickStackHdl, Button*, void ) { @@ -197,14 +196,13 @@ IMPL_LINK_NOARG_TYPED( AlignmentPropertyPanel, ClickStackHdl, Button*, void ) GetBindings()->GetDispatcher()->Execute( SID_ATTR_ALIGN_STACKED, SfxCallMode::RECORD, &aStackItem, 0L ); } -IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl) +IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, MFLeftIndentMdyHdl, Edit&, void) { mpCBXWrapText->EnableTriState(false); sal_uInt16 nVal = (sal_uInt16)mpMFLeftIndent->GetValue(); SfxUInt16Item aItem( SID_ATTR_ALIGN_INDENT, (sal_uInt16)CalcToUnit( nVal, SFX_MAPUNIT_TWIP ) ); GetBindings()->GetDispatcher()->Execute(SID_ATTR_ALIGN_INDENT, SfxCallMode::RECORD, &aItem, 0L); - return 0L; } IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, CBOXMergnCellClkHdl, Button*, void) diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 3bb6b6e3d75e..0572de89eded 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -97,10 +97,10 @@ private: ::sfx2::sidebar::EnumContext maContext; SfxBindings* mpBindings; - DECL_LINK( MFLeftIndentMdyHdl, void * ); + DECL_LINK_TYPED( MFLeftIndentMdyHdl, Edit&, void ); DECL_LINK_TYPED( CBOXMergnCellClkHdl, Button*, void ); DECL_LINK_TYPED( CBOXWrapTextClkHdl, Button*, void ); - DECL_LINK( AngleModifiedHdl, void * ); + DECL_LINK_TYPED( AngleModifiedHdl, Edit&, void ); DECL_LINK_TYPED( ClickStackHdl, Button*, void ); DECL_LINK_TYPED( ReferenceEdgeHdl, Button*, void ); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index fa97da227d22..747a0b2138f5 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -92,7 +92,7 @@ void NumberFormatPropertyPanel::Initialize() mpLbCategory->SetAccessibleName(OUString( "Category")); mpLbCategory->SetDropDownLineCount(mpLbCategory->GetEntryCount()); - Link<> aLink = LINK(this, NumberFormatPropertyPanel, NumFormatValueHdl); + Link<Edit&,void> aLink = LINK(this, NumberFormatPropertyPanel, NumFormatValueHdl); mpEdDecimals->SetModifyHdl( aLink ); mpEdLeadZeroes->SetModifyHdl( aLink ); @@ -118,9 +118,9 @@ IMPL_LINK_TYPED( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, IMPL_LINK_NOARG_TYPED( NumberFormatPropertyPanel, NumFormatValueClickHdl, Button*, void ) { - NumFormatValueHdl(nullptr); + NumFormatValueHdl(*mpEdDecimals); } -IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueHdl ) +IMPL_LINK_NOARG_TYPED( NumberFormatPropertyPanel, NumFormatValueHdl, Edit&, void ) { OUString aFormat; OUString sBreak = ","; @@ -151,7 +151,6 @@ IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueHdl ) SfxStringItem aItem( SID_NUMBER_FORMAT, aFormat ); GetBindings()->GetDispatcher()->Execute(SID_NUMBER_FORMAT, SfxCallMode::RECORD, &aItem, 0L); - return 0L; } VclPtr<vcl::Window> NumberFormatPropertyPanel::Create ( diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index e9e9b1eaf60f..31ff2b45745d 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -26,6 +26,7 @@ class FixedText; class ListBox; class NumericField; +class Edit; namespace sc { namespace sidebar { @@ -84,7 +85,7 @@ private: SfxBindings* mpBindings; DECL_LINK_TYPED(NumFormatSelectHdl, ListBox&, void); - DECL_LINK(NumFormatValueHdl, void*); + DECL_LINK_TYPED(NumFormatValueHdl, Edit&, void); DECL_LINK_TYPED(NumFormatValueClickHdl, Button*, void); void Initialize(); diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 45b75c82ba14..32c30941e2a5 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -105,7 +105,7 @@ ScXMLSourceDlg::ScXMLSourceDlg( mpLbTree->SetSelectHdl(LINK(this, ScXMLSourceDlg, TreeItemSelectHdl)); - Link<> aLink = LINK(this, ScXMLSourceDlg, RefModifiedHdl); + Link<Edit&,void> aLink = LINK(this, ScXMLSourceDlg, RefModifiedHdl); mpRefEdit->SetModifyHdl(aLink); mpBtnOk->Disable(); @@ -682,10 +682,9 @@ IMPL_LINK_NOARG_TYPED(ScXMLSourceDlg, TreeItemSelectHdl, SvTreeListBox*, void) TreeItemSelected(); } -IMPL_LINK_NOARG(ScXMLSourceDlg, RefModifiedHdl) +IMPL_LINK_NOARG_TYPED(ScXMLSourceDlg, RefModifiedHdl, Edit&, void) { RefEditModified(); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |