diff options
Diffstat (limited to 'sc/source')
238 files changed, 824 insertions, 824 deletions
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index fa481a3421cc..de91bf751f79 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -321,7 +321,7 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) pChangeTrack = pTrack; } -IMPL_LINK_NOARG_TYPED(ScDocument, TrackTimeHdl, Idle *, void) +IMPL_LINK_NOARG(ScDocument, TrackTimeHdl, Idle *, void) { if ( ScDdeLink::IsInUpdate() ) // do not nest { diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 176b0c477304..711d0a03c532 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -230,7 +230,7 @@ bool ScDocument::IsChart( const SdrObject* pObject ) return false; } -IMPL_LINK_TYPED( ScDocument, GetUserDefinedColor, sal_uInt16, nColorIndex, Color* ) +IMPL_LINK( ScDocument, GetUserDefinedColor, sal_uInt16, nColorIndex, Color* ) { return const_cast<Color*>(&(GetColorList()->GetColor(nColorIndex)->GetColor())); } diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx index 3d02e082dd31..cc5fe0d39875 100644 --- a/sc/source/core/data/userdat.cxx +++ b/sc/source/core/data/userdat.cxx @@ -31,7 +31,7 @@ ScDrawObjFactory::~ScDrawObjFactory() SdrObjFactory::RemoveMakeUserDataHdl( LINK ( this, ScDrawObjFactory, MakeUserData ) ); } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( ScDrawObjFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) { if ( aParams.nInventor == SC_DRAWLAYER ) diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index f2f2dd03e691..b1d6e94b6546 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -545,7 +545,7 @@ ScAppCfg::ScAppCfg() : } aCompatItem.SetCommitLink( LINK(this, ScAppCfg, CompatCommitHdl) ); } - IMPL_LINK_NOARG_TYPED(ScAppCfg, LayoutCommitHdl, ScLinkConfigItem&, void) + IMPL_LINK_NOARG(ScAppCfg, LayoutCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -578,7 +578,7 @@ ScAppCfg::ScAppCfg() : aLayoutItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, InputCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, InputCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetInputPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -602,7 +602,7 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, InputCommitHdl, ScLinkConfigItem&, void) aInputItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, RevisionCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, RevisionCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetRevisionPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -629,7 +629,7 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, RevisionCommitHdl, ScLinkConfigItem&, void) aRevisionItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, ContentCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, ContentCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetContentPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -647,7 +647,7 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, ContentCommitHdl, ScLinkConfigItem&, void) aContentItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, SortListCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, SortListCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetSortListPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -665,7 +665,7 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, SortListCommitHdl, ScLinkConfigItem&, void) aSortListItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, MiscCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, MiscCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetMiscPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -689,7 +689,7 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, MiscCommitHdl, ScLinkConfigItem&, void) aMiscItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScAppCfg, CompatCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScAppCfg, CompatCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetCompatPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 52e761f0e64d..b23aa4b914ba 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -595,7 +595,7 @@ void ScChartListenerCollection::StartTimer() aIdle.Start(); } -IMPL_LINK_NOARG_TYPED(ScChartListenerCollection, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScChartListenerCollection, TimerHdl, Idle *, void) { if ( Application::AnyInput( VclInputFlags::KEYBOARD ) ) { diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx index 985774b952e9..8d3b59145369 100644 --- a/sc/source/core/tool/chartlock.cxx +++ b/sc/source/core/tool/chartlock.cxx @@ -174,7 +174,7 @@ void ScTemporaryChartLock::AlsoLockThisChart( const Reference< frame::XModel >& mapScChartLockGuard->AlsoLockThisChart( xModel ); } -IMPL_LINK_NOARG_TYPED(ScTemporaryChartLock, TimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(ScTemporaryChartLock, TimeoutHdl, Timer *, void) { mapScChartLockGuard.reset(); } diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index cf5671f9e0bb..63407bfe45f1 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -318,7 +318,7 @@ ScDocCfg::ScDocCfg() : aLayoutItem.SetCommitLink( LINK( this, ScDocCfg, LayoutCommitHdl ) ); } -IMPL_LINK_NOARG_TYPED(ScDocCfg, CalcCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScDocCfg, CalcCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetCalcPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -377,7 +377,7 @@ IMPL_LINK_NOARG_TYPED(ScDocCfg, CalcCommitHdl, ScLinkConfigItem&, void) aCalcItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScDocCfg, LayoutCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScDocCfg, LayoutCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 95491e63920f..4c2b4f5225f9 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -486,7 +486,7 @@ ScViewCfg::ScViewCfg() : aGridItem.SetCommitLink( LINK( this, ScViewCfg, GridCommitHdl ) ); } -IMPL_LINK_NOARG_TYPED(ScViewCfg, LayoutCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScViewCfg, LayoutCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -531,7 +531,7 @@ IMPL_LINK_NOARG_TYPED(ScViewCfg, LayoutCommitHdl, ScLinkConfigItem&, void) aLayoutItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScViewCfg, DisplayCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScViewCfg, DisplayCommitHdl, ScLinkConfigItem&, void) { Sequence<OUString> aNames = GetDisplayPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -573,7 +573,7 @@ IMPL_LINK_NOARG_TYPED(ScViewCfg, DisplayCommitHdl, ScLinkConfigItem&, void) aDisplayItem.PutProperties(aNames, aValues); } -IMPL_LINK_NOARG_TYPED(ScViewCfg, GridCommitHdl, ScLinkConfigItem&, void) +IMPL_LINK_NOARG(ScViewCfg, GridCommitHdl, ScLinkConfigItem&, void) { const ScGridOptions& rGrid = GetGridOptions(); diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index a094f04512f6..11ce7137cb43 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -877,7 +877,7 @@ void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo ) NewActEntry( pActEntry ); // New free flying pActEntry } -IMPL_LINK_TYPED( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo&, rInfo, void ) +IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo&, rInfo, void ) { switch ( rInfo.eState ) { @@ -3210,7 +3210,7 @@ void ScHTMLQueryParser::ParseStyle(const OUString&) {} #endif -IMPL_LINK_TYPED( ScHTMLQueryParser, HTMLImportHdl, ImportInfo&, rInfo, void ) +IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, ImportInfo&, rInfo, void ) { switch( rInfo.eState ) { diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 61787e2f49b8..c963b99142c2 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -176,7 +176,7 @@ private: bool bInCell:1; bool bInTitle:1; - DECL_LINK_TYPED( HTMLImportHdl, ImportInfo&, void ); + DECL_LINK( HTMLImportHdl, ImportInfo&, void ); void NewActEntry( ScEEParseEntry* ); static void EntryEnd( ScEEParseEntry*, const ESelection& ); void ProcToken( ImportInfo* ); @@ -605,7 +605,7 @@ private: void ParseStyle(const OUString& rStrm); - DECL_LINK_TYPED( HTMLImportHdl, ImportInfo&, void ); + DECL_LINK( HTMLImportHdl, ImportInfo&, void ); private: typedef ::std::unique_ptr< ScHTMLGlobalTable > ScHTMLGlobalTablePtr; diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index d96b57c20259..3fe1db4c62d6 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -62,7 +62,7 @@ private: sal_uInt16 nLastWidth; bool bNewDef; - DECL_LINK_TYPED( RTFImportHdl, ImportInfo&, void ); + DECL_LINK( RTFImportHdl, ImportInfo&, void ); inline void NextRow(); void EntryEnd( ScEEParseEntry*, const ESelection& ); void ProcToken( ImportInfo* ); diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index 48a939625741..923e69d8ba9b 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -154,7 +154,7 @@ void ScRTFParser::ColAdjust() } } -IMPL_LINK_TYPED( ScRTFParser, RTFImportHdl, ImportInfo&, rInfo, void ) +IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo&, rInfo, void ) { switch ( rInfo.eState ) { diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index a21d4ffc9dd0..b102b976985a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1480,7 +1480,7 @@ void SAL_CALL ScAccessibleDocument::disposing( const lang::EventObject& /* Sourc //===== SfxListener ===================================================== -IMPL_LINK_TYPED( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow(), "Window???" ); switch ( rEvent.GetId() ) diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index dc7ce4175f70..2b3fdcfa2b19 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -901,7 +901,7 @@ SvxEditViewForwarder* ScAccessibleCellTextData::GetEditViewForwarder( bool /* bC return nullptr; } -IMPL_LINK_TYPED(ScAccessibleTextData, NotifyHdl, EENotify&, aNotify, void) +IMPL_LINK(ScAccessibleTextData, NotifyHdl, EENotify&, aNotify, void) { ::std::unique_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( &aNotify ); @@ -1006,7 +1006,7 @@ SvxEditViewForwarder* ScAccessibleEditObjectTextData::GetEditViewForwarder( bool return mpEditViewForwarder; } -IMPL_LINK_TYPED(ScAccessibleEditObjectTextData, NotifyHdl, EENotify&, rNotify, void) +IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify&, rNotify, void) { ::std::unique_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( &rNotify ); diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index 84ed14c80f64..abcc1cd7355a 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -140,7 +140,7 @@ sal_Int16 ScAnalysisOfVarianceDialog::GetUndoNameId() return STR_ANALYSIS_OF_VARIANCE_UNDO_NAME; } -IMPL_LINK_NOARG_TYPED( ScAnalysisOfVarianceDialog, FactorChanged, RadioButton&, void ) +IMPL_LINK_NOARG( ScAnalysisOfVarianceDialog, FactorChanged, RadioButton&, void ) { FactorChanged(); } diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index 7fdad4b53a5e..c59e9cc14561 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -326,23 +326,23 @@ void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const pDocShell->PostPaint( maInputRange, PaintPartFlags::Grid ); } -IMPL_LINK_NOARG_TYPED( ScRandomNumberGeneratorDialog, OkClicked, Button*, void ) +IMPL_LINK_NOARG( ScRandomNumberGeneratorDialog, OkClicked, Button*, void ) { ApplyClicked(nullptr); CloseClicked(nullptr); } -IMPL_LINK_NOARG_TYPED( ScRandomNumberGeneratorDialog, ApplyClicked, Button*, void ) +IMPL_LINK_NOARG( ScRandomNumberGeneratorDialog, ApplyClicked, Button*, void ) { SelectGeneratorAndGenerateNumbers(); } -IMPL_LINK_NOARG_TYPED( ScRandomNumberGeneratorDialog, CloseClicked, Button*, void ) +IMPL_LINK_NOARG( ScRandomNumberGeneratorDialog, CloseClicked, Button*, void ) { Close(); } -IMPL_LINK_TYPED( ScRandomNumberGeneratorDialog, GetFocusHandler, Control&, rCtrl, void ) +IMPL_LINK( ScRandomNumberGeneratorDialog, GetFocusHandler, Control&, rCtrl, void ) { Edit* pEdit = nullptr; @@ -353,12 +353,12 @@ IMPL_LINK_TYPED( ScRandomNumberGeneratorDialog, GetFocusHandler, Control&, rCtrl pEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, LoseFocusHandler, Control&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, LoseFocusHandler, Control&, void) { mbDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, InputRangeModified, Edit&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, InputRangeModified, Edit&, void) { ScRangeList aRangeList; bool bValid = ParseWithNames( aRangeList, mpInputRangeEdit->GetText(), mpDoc); @@ -379,7 +379,7 @@ IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, InputRangeModified, Edit&, } } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, Parameter1ValueModified, Edit&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter1ValueModified, Edit&, void) { sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) ); @@ -395,7 +395,7 @@ IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, Parameter1ValueModified, Ed } } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, Parameter2ValueModified, Edit&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter2ValueModified, Edit&, void) { sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) ); @@ -411,13 +411,13 @@ IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, Parameter2ValueModified, Ed } } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, CheckChanged, CheckBox&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, CheckChanged, CheckBox&, void) { mpSeed->Enable(mpEnableSeed->IsChecked()); mpDecimalPlaces->Enable(mpEnableRounding->IsChecked()); } -IMPL_LINK_NOARG_TYPED(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, void) { sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) ); diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index 035327d97f15..06571992f8a3 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -288,13 +288,13 @@ void ScSamplingDialog::PerformSampling() pDocShell->PostPaint(aModifiedRange, PaintPartFlags::Grid); } -IMPL_LINK_NOARG_TYPED( ScSamplingDialog, OkClicked, Button*, void ) +IMPL_LINK_NOARG( ScSamplingDialog, OkClicked, Button*, void ) { PerformSampling(); Close(); } -IMPL_LINK_TYPED( ScSamplingDialog, GetFocusHandler, Control&, rCtrl, void ) +IMPL_LINK( ScSamplingDialog, GetFocusHandler, Control&, rCtrl, void ) { mpActiveEdit = nullptr; @@ -307,19 +307,19 @@ IMPL_LINK_TYPED( ScSamplingDialog, GetFocusHandler, Control&, rCtrl, void ) mpActiveEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScSamplingDialog, LoseFocusHandler, Control&, void) +IMPL_LINK_NOARG(ScSamplingDialog, LoseFocusHandler, Control&, void) { mDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG_TYPED(ScSamplingDialog, SamplingSizeValueModified, Edit&, void) +IMPL_LINK_NOARG(ScSamplingDialog, SamplingSizeValueModified, Edit&, void) { sal_Int64 aPopulationSize = mInputRange.aEnd.Row() - mInputRange.aStart.Row() + 1; if (mpSampleSize->GetValue() > aPopulationSize) mpSampleSize->SetValue(aPopulationSize); } -IMPL_LINK_NOARG_TYPED(ScSamplingDialog, ToggleSamplingMethod, RadioButton&, void) +IMPL_LINK_NOARG(ScSamplingDialog, ToggleSamplingMethod, RadioButton&, void) { ToggleSamplingMethod(); } @@ -338,7 +338,7 @@ void ScSamplingDialog::ToggleSamplingMethod() } } -IMPL_LINK_NOARG_TYPED(ScSamplingDialog, RefInputModifyHandler, Edit&, void) +IMPL_LINK_NOARG(ScSamplingDialog, RefInputModifyHandler, Edit&, void) { if ( mpActiveEdit ) { diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx index 80dd45724fe3..78bc143ebaec 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx @@ -194,13 +194,13 @@ void ScStatisticsInputOutputDialog::SetReference( const ScRange& rReferenceRange mpButtonOk->Disable(); } -IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, OkClicked, Button*, void ) +IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, OkClicked, Button*, void ) { CalculateInputAndWriteToOutput(); Close(); } -IMPL_LINK_TYPED( ScStatisticsInputOutputDialog, GetFocusHandler, Control&, rCtrl, void ) +IMPL_LINK( ScStatisticsInputOutputDialog, GetFocusHandler, Control&, rCtrl, void ) { mpActiveEdit = nullptr; @@ -213,12 +213,12 @@ IMPL_LINK_TYPED( ScStatisticsInputOutputDialog, GetFocusHandler, Control&, rCtrl mpActiveEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, LoseFocusHandler, Control&, void ) +IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, LoseFocusHandler, Control&, void ) { mDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, GroupByChanged, RadioButton&, void ) +IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, GroupByChanged, RadioButton&, void ) { if (mpGroupByColumnsRadio->IsChecked()) mGroupedBy = BY_COLUMN; @@ -226,7 +226,7 @@ IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, GroupByChanged, RadioButto mGroupedBy = BY_ROW; } -IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, RefInputModifyHandler, Edit&, void ) +IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, RefInputModifyHandler, Edit&, void ) { if ( mpActiveEdit ) { diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx index 1277a8e29619..d32effd4264b 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx @@ -207,13 +207,13 @@ void ScStatisticsTwoVariableDialog::SetReference( const ScRange& rReferenceRange mpButtonOk->Disable(); } -IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, OkClicked, Button*, void ) +IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, OkClicked, Button*, void ) { CalculateInputAndWriteToOutput(); Close(); } -IMPL_LINK_TYPED( ScStatisticsTwoVariableDialog, GetFocusHandler, Control&, rCtrl, void ) +IMPL_LINK( ScStatisticsTwoVariableDialog, GetFocusHandler, Control&, rCtrl, void ) { mpActiveEdit = nullptr; if( &rCtrl == mpVariable1RangeEdit @@ -236,12 +236,12 @@ IMPL_LINK_TYPED( ScStatisticsTwoVariableDialog, GetFocusHandler, Control&, rCtrl mpActiveEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, LoseFocusHandler, Control&, void ) +IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, LoseFocusHandler, Control&, void ) { mDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, GroupByChanged, RadioButton&, void ) +IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, GroupByChanged, RadioButton&, void ) { if (mpGroupByColumnsRadio->IsChecked()) mGroupedBy = BY_COLUMN; @@ -249,7 +249,7 @@ IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, GroupByChanged, RadioButto mGroupedBy = BY_ROW; } -IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, RefInputModifyHandler, Edit&, void ) +IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, RefInputModifyHandler, Edit&, void ) { if ( mpActiveEdit ) { diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index d440c691e175..43b3c5ed8210 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -855,13 +855,13 @@ void ScInputHandler::GetFormulaData() } } -IMPL_LINK_TYPED( ScInputHandler, ShowHideTipVisibleParentListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( ScInputHandler, ShowHideTipVisibleParentListener, VclWindowEvent&, rEvent, void ) { if( rEvent.GetId() == VCLEVENT_OBJECT_DYING || rEvent.GetId() == VCLEVENT_WINDOW_HIDE ) HideTip(); } -IMPL_LINK_TYPED( ScInputHandler, ShowHideTipVisibleSecParentListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( ScInputHandler, ShowHideTipVisibleSecParentListener, VclWindowEvent&, rEvent, void ) { if( rEvent.GetId() == VCLEVENT_OBJECT_DYING || rEvent.GetId() == VCLEVENT_WINDOW_HIDE ) HideTipBelow(); @@ -2229,7 +2229,7 @@ void ScInputHandler::SyncViews( EditView* pSourceView ) } } -IMPL_LINK_NOARG_TYPED(ScInputHandler, ModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ScInputHandler, ModifyHdl, LinkParamNone*, void) { if ( !bInOwnChange && ( eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE ) && pEngine && pEngine->GetUpdateMode() && pInputWin ) @@ -3770,7 +3770,7 @@ void ScInputHandler::ResetDelayTimer() } } -IMPL_LINK_TYPED( ScInputHandler, DelayTimer, Timer*, pTimer, void ) +IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer, void ) { if ( pTimer == pDelayTimer ) { diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index fae016f2e89a..7424fd3e70a0 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1034,7 +1034,7 @@ void ScInputBarGroup::DecrementVerticalSize() } } -IMPL_LINK_NOARG_TYPED(ScInputBarGroup, ClickHdl, Button*, void) +IMPL_LINK_NOARG(ScInputBarGroup, ClickHdl, Button*, void) { vcl::Window* w = GetParent(); ScInputWindow* pParent; @@ -1112,7 +1112,7 @@ void ScInputBarGroup::TriggerToolboxLayout() } } -IMPL_LINK_NOARG_TYPED(ScInputBarGroup, Impl_ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ScInputBarGroup, Impl_ScrollHdl, ScrollBar*, void) { maTextWnd->DoScroll(); } @@ -1632,7 +1632,7 @@ void ScTextWnd::UpdateAutoCorrFlag() } } -IMPL_LINK_TYPED(ScTextWnd, NotifyHdl, EENotify&, rNotify, void) +IMPL_LINK(ScTextWnd, NotifyHdl, EENotify&, rNotify, void) { // need to process EE_NOTIFY_TEXTVIEWSCROLLED here // sometimes we don't seem to get EE_NOTIFY_TEXTVIEWSCROLLED e.g. when @@ -1644,7 +1644,7 @@ IMPL_LINK_TYPED(ScTextWnd, NotifyHdl, EENotify&, rNotify, void) SetScrollBarRange(); } -IMPL_LINK_NOARG_TYPED(ScTextWnd, ModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ScTextWnd, ModifyHdl, LinkParamNone*, void) { if (pEditView && !bInputMode) { diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 561ff2bfea95..af9fa54498b1 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1829,7 +1829,7 @@ static void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) } } -IMPL_LINK_NOARG_TYPED(ScModule, IdleHandler, Timer *, void) +IMPL_LINK_NOARG(ScModule, IdleHandler, Timer *, void) { if ( Application::AnyInput( VclInputFlags::MOUSE | VclInputFlags::KEYBOARD ) ) { @@ -1900,7 +1900,7 @@ IMPL_LINK_NOARG_TYPED(ScModule, IdleHandler, Timer *, void) aIdleTimer.Start(); } -IMPL_LINK_NOARG_TYPED(ScModule, SpellTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScModule, SpellTimerHdl, Idle *, void) { if ( Application::AnyInput( VclInputFlags::KEYBOARD ) ) { @@ -2126,7 +2126,7 @@ VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent return pRet; } -IMPL_LINK_TYPED( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void ) +IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void ) { //TODO: Merge with ScFieldEditEngine! if (!pInfo) diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 8c5005f60e63..bbe864d84daa 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -88,7 +88,7 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } } -IMPL_LINK_NOARG_TYPED(ScAttrDlg, OkHandler, SfxPoolItem*, void) +IMPL_LINK_NOARG(ScAttrDlg, OkHandler, SfxPoolItem*, void) { GetOKButton().GetClickHdl().Call( nullptr ); } diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 1717a610a723..3217308bafdd 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -157,7 +157,7 @@ DeactivateRC ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) return DeactivateRC::LeavePage; } -IMPL_LINK_TYPED( ScTabPageProtection, ButtonClickHdl, Button*, pBox, void ) +IMPL_LINK( ScTabPageProtection, ButtonClickHdl, Button*, pBox, void ) { TriState eState = static_cast<TriStateBox*>(pBox)->GetState(); if ( eState == TRISTATE_INDET ) diff --git a/sc/source/ui/cctrl/cbnumberformat.cxx b/sc/source/ui/cctrl/cbnumberformat.cxx index 591b2ec31d31..dede89437b7c 100644 --- a/sc/source/ui/cctrl/cbnumberformat.cxx +++ b/sc/source/ui/cctrl/cbnumberformat.cxx @@ -42,7 +42,7 @@ ScNumberFormat::ScNumberFormat(vcl::Window* pParent, WinBits nStyle) : InsertEntry(ScGlobal::GetRscString(STR_TEXT)); } -IMPL_STATIC_LINK_TYPED(ScNumberFormat, NumFormatSelectHdl, ListBox&, rBox, void) +IMPL_STATIC_LINK(ScNumberFormat, NumFormatSelectHdl, ListBox&, rBox, void) { if(SfxViewFrame::Current()) { diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 0b5174e49c54..374914be90ac 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -64,7 +64,7 @@ void ScMenuFloatingWindow::SubMenuItemData::reset() maTimer.Stop(); } -IMPL_LINK_NOARG_TYPED(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, Timer *, void) { mpParent->handleMenuTimeout(this); } @@ -1175,7 +1175,7 @@ void ScCheckListMenuWindow::selectCurrentMemberOnly(bool bSet) maChecks->CheckEntry(pEntry, bSet ); } -IMPL_LINK_TYPED( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn, void ) +IMPL_LINK( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn, void ) { if (pBtn == maBtnOk.get()) close(true); @@ -1191,7 +1191,7 @@ IMPL_LINK_TYPED( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, TriStateHdl, Button*, void) +IMPL_LINK_NOARG(ScCheckListMenuWindow, TriStateHdl, Button*, void) { switch (mePrevToggleAllState) { @@ -1213,7 +1213,7 @@ IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, TriStateHdl, Button*, void) mePrevToggleAllState = maChkToggleAll->GetState(); } -IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, EdModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl, Edit&, void) { OUString aSearchText = maEdSearch->GetText(); aSearchText = aSearchText.toAsciiLowerCase(); @@ -1289,7 +1289,7 @@ IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, EdModifyHdl, Edit&, void) maBtnOk->Enable( nSelCount != 0); } -IMPL_LINK_TYPED( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks, void ) +IMPL_LINK( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks, void ) { if (pChecks != maChecks.get()) return; diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 9a455b4bb122..ab2e08983b3f 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -255,7 +255,7 @@ ScDataBarFormatData* ScDataBarSettingsDlg::GetData() return pData; } -IMPL_LINK_NOARG_TYPED( ScDataBarSettingsDlg, OkBtnHdl, Button*, void ) +IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl, Button*, void ) { //check that min < max bool bWarn = false; @@ -308,7 +308,7 @@ IMPL_LINK_NOARG_TYPED( ScDataBarSettingsDlg, OkBtnHdl, Button*, void ) } } -IMPL_LINK_NOARG_TYPED( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void ) { sal_Int32 nSelectMin = mpLbTypeMin->GetSelectEntryPos(); if( nSelectMin <= COLORSCALE_MAX) @@ -341,7 +341,7 @@ IMPL_LINK_NOARG_TYPED( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void ) } } -IMPL_LINK_NOARG_TYPED( ScDataBarSettingsDlg, PosSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScDataBarSettingsDlg, PosSelectHdl, ListBox&, void ) { sal_Int32 axisPos = mpLbAxisPos->GetSelectEntryPos(); if(axisPos != 2 && axisPos != 1) // disable if axis vertical position is automatic diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 130f2670451d..98bcc4adf03d 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -237,7 +237,7 @@ void ScCondFormatList::DoScroll(long nDelta) mpScrollBar->SetPosPixel(aNewPoint); } -IMPL_LINK_TYPED(ScCondFormatList, ColFormatTypeHdl, ListBox&, rBox, void) +IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox&, rBox, void) { EntryContainer::iterator itr = maEntries.begin(); for(; itr != maEntries.end(); ++itr) @@ -287,7 +287,7 @@ IMPL_LINK_TYPED(ScCondFormatList, ColFormatTypeHdl, ListBox&, rBox, void) RecalcAll(); } -IMPL_LINK_TYPED(ScCondFormatList, TypeListHdl, ListBox&, rBox, void) +IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox&, rBox, void) { //Resolves: fdo#79021 At this point we are still inside the ListBox Select. //If we call maEntries.replace here then the pBox will be deleted before it @@ -296,7 +296,7 @@ IMPL_LINK_TYPED(ScCondFormatList, TypeListHdl, ListBox&, rBox, void) Application::PostUserEvent(LINK(this, ScCondFormatList, AfterTypeListHdl), &rBox, true); } -IMPL_LINK_TYPED(ScCondFormatList, AfterTypeListHdl, void*, p, void) +IMPL_LINK(ScCondFormatList, AfterTypeListHdl, void*, p, void) { ListBox* pBox = static_cast<ListBox*>(p); EntryContainer::iterator itr = maEntries.begin(); @@ -361,7 +361,7 @@ IMPL_LINK_TYPED(ScCondFormatList, AfterTypeListHdl, void*, p, void) RecalcAll(); } -IMPL_LINK_NOARG_TYPED( ScCondFormatList, AddBtnHdl, Button*, void ) +IMPL_LINK_NOARG( ScCondFormatList, AddBtnHdl, Button*, void ) { VclPtr<ScCondFrmtEntry> pNewEntry = VclPtr<ScConditionFrmtEntry>::Create(this, mpDoc, mpDialogParent, maPos); maEntries.push_back( pNewEntry ); @@ -374,7 +374,7 @@ IMPL_LINK_NOARG_TYPED( ScCondFormatList, AddBtnHdl, Button*, void ) RecalcAll(); } -IMPL_LINK_NOARG_TYPED( ScCondFormatList, RemoveBtnHdl, Button*, void ) +IMPL_LINK_NOARG( ScCondFormatList, RemoveBtnHdl, Button*, void ) { for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) { @@ -389,7 +389,7 @@ IMPL_LINK_NOARG_TYPED( ScCondFormatList, RemoveBtnHdl, Button*, void ) RecalcAll(); } -IMPL_LINK_TYPED( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry&, rEntry, void ) +IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry&, rEntry, void ) { if(rEntry.IsSelected()) return; @@ -408,7 +408,7 @@ IMPL_LINK_TYPED( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry&, rEntry, voi GrabFocus(); } -IMPL_LINK_NOARG_TYPED( ScCondFormatList, ScrollHdl, ScrollBar*, void ) +IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl, ScrollBar*, void ) { DoScroll(mpScrollBar->GetDelta()); } @@ -660,7 +660,7 @@ void ScCondFormatDlg::CancelPressed() Close(); } -IMPL_LINK_TYPED( ScCondFormatDlg, EdRangeModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit&, rEdit, void ) { OUString aRangeStr = rEdit.GetText(); ScRangeList aRange; @@ -674,12 +674,12 @@ IMPL_LINK_TYPED( ScCondFormatDlg, EdRangeModifyHdl, Edit&, rEdit, void ) updateTitle(); } -IMPL_LINK_TYPED( ScCondFormatDlg, RangeGetFocusHdl, Control&, rControl, void ) +IMPL_LINK( ScCondFormatDlg, RangeGetFocusHdl, Control&, rControl, void ) { mpLastEdit = static_cast<formula::RefEdit*>(&rControl); } -IMPL_LINK_TYPED( ScCondFormatDlg, BtnPressedHdl, Button*, pBtn, void) +IMPL_LINK( ScCondFormatDlg, BtnPressedHdl, Button*, pBtn, void) { if (pBtn == mpBtnOk) OkPressed(); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 0343b040253c..216a0ef82f93 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -297,7 +297,7 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const return pEntry; } -IMPL_LINK_TYPED(ScConditionFrmtEntry, OnEdChanged, Edit&, rEdit, void) +IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit&, rEdit, void) { OUString aFormula = rEdit.GetText(); @@ -543,7 +543,7 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre } -IMPL_LINK_NOARG_TYPED(ScConditionFrmtEntry, StyleSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl, ListBox&, void) { mbIsInStyleCreate = true; StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() ); @@ -599,7 +599,7 @@ void ScFormulaFrmtEntry::Init(ScCondFormatDlg* pDialogParent) maLbStyle->SetSelectHdl( LINK( this, ScFormulaFrmtEntry, StyleSelectHdl ) ); } -IMPL_LINK_NOARG_TYPED(ScFormulaFrmtEntry, StyleSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScFormulaFrmtEntry, StyleSelectHdl, ListBox&, void) { StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() ); } @@ -875,7 +875,7 @@ void ScColorScale2FrmtEntry::SetInactive() Deselect(); } -IMPL_LINK_TYPED( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) +IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) { Edit* pEd = nullptr; if (&rBox == maLbEntryTypeMin.get()) @@ -1067,7 +1067,7 @@ void ScColorScale3FrmtEntry::SetInactive() Deselect(); } -IMPL_LINK_TYPED( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) +IMPL_LINK( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) { Edit* pEd = nullptr; if(&rBox == maLbEntryTypeMin.get()) @@ -1093,7 +1093,7 @@ IMPL_LINK_TYPED( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) pEd->Disable(); } -IMPL_LINK_NOARG_TYPED( ScConditionFrmtEntry, ConditionTypeSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScConditionFrmtEntry, ConditionTypeSelectHdl, ListBox&, void ) { sal_Int32 nSelectPos = maLbCondType->GetSelectEntryPos(); ScConditionMode eMode = EntryPosToConditionMode(nSelectPos); @@ -1259,7 +1259,7 @@ void ScDataBarFrmtEntry::SetInactive() Deselect(); } -IMPL_LINK_NOARG_TYPED( ScDataBarFrmtEntry, DataBarTypeSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl, ListBox&, void ) { sal_Int32 nSelectPos = maLbDataBarMinType->GetSelectEntryPos(); if(nSelectPos <= COLORSCALE_MAX) @@ -1274,7 +1274,7 @@ IMPL_LINK_NOARG_TYPED( ScDataBarFrmtEntry, DataBarTypeSelectHdl, ListBox&, void maEdDataBarMax->Enable(); } -IMPL_LINK_NOARG_TYPED( ScDataBarFrmtEntry, OptionBtnHdl, Button*, void ) +IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl, Button*, void ) { SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType.get(), *maEdDataBarMin.get(), mpDoc, maPos, true); SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType.get(), *maEdDataBarMax.get(), mpDoc, maPos, true); @@ -1385,7 +1385,7 @@ OUString ScDateFrmtEntry::GetExpressionString() return ScCondFormatHelper::GetExpression(DATE, 0); } -IMPL_LINK_NOARG_TYPED( ScDateFrmtEntry, StyleSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl, ListBox&, void ) { mbIsInStyleCreate = true; StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() ); @@ -1562,7 +1562,7 @@ void ScIconSetFrmtEntry::Init() maLbIconSetType->SetSelectHdl( LINK( this, ScIconSetFrmtEntry, IconSetTypeHdl ) ); } -IMPL_LINK_NOARG_TYPED( ScIconSetFrmtEntry, IconSetTypeHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl, ListBox&, void ) { ScIconSetMap* pMap = ScIconSetFormat::getIconSetMap(); diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 9128941d5573..ba9df607709c 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -153,18 +153,18 @@ ScConditionalFormat* ScCondFormatManagerDlg::GetCondFormatSelected() return m_pCtrlManager->GetSelection(); } -IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, RemoveBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScCondFormatManagerDlg, RemoveBtnHdl, Button*, void) { m_pCtrlManager->DeleteSelection(); mbModified = true; } -IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnClickHdl, Button*, void) +IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnClickHdl, Button*, void) { mbModified = true; EditBtnHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl, SvTreeListBox*, bool) { ScConditionalFormat* pFormat = m_pCtrlManager->GetSelection(); @@ -177,7 +177,7 @@ IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnHdl, SvTreeListBox*, bool) return false; } -IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, AddBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScCondFormatManagerDlg, AddBtnHdl, Button*, void) { mbModified = true; EndDialog( DLG_RET_ADD ); diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index dd8ef5d6c150..312fdd33dee7 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -662,18 +662,18 @@ bool ScPivotLayoutDialog::Close() return DoClose( ScPivotLayoutWrapper::GetChildWindowId() ); } -IMPL_LINK_NOARG_TYPED( ScPivotLayoutDialog, OKClicked, Button*, void ) +IMPL_LINK_NOARG( ScPivotLayoutDialog, OKClicked, Button*, void ) { ApplyChanges(); Close(); } -IMPL_LINK_NOARG_TYPED( ScPivotLayoutDialog, CancelClicked, Button*, void ) +IMPL_LINK_NOARG( ScPivotLayoutDialog, CancelClicked, Button*, void ) { Close(); } -IMPL_LINK_TYPED(ScPivotLayoutDialog, GetFocusHandler, Control&, rCtrl, void) +IMPL_LINK(ScPivotLayoutDialog, GetFocusHandler, Control&, rCtrl, void) { mpActiveEdit = nullptr; @@ -692,22 +692,22 @@ IMPL_LINK_TYPED(ScPivotLayoutDialog, GetFocusHandler, Control&, rCtrl, void) mpActiveEdit->SetSelection(Selection(0, SELECTION_MAX)); } -IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, LoseFocusHandler, Control&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, LoseFocusHandler, Control&, void) { mbDialogLostFocus = !IsActive(); } -IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, SourceListSelected, ListBox&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, SourceListSelected, ListBox&, void) { UpdateSourceRange(); } -IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, SourceEditModified, Edit&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, SourceEditModified, Edit&, void) { UpdateSourceRange(); } -IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, ToggleSource, RadioButton&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleSource, RadioButton&, void) { ToggleSource(); } @@ -722,7 +722,7 @@ void ScPivotLayoutDialog::ToggleSource() UpdateSourceRange(); } -IMPL_LINK_NOARG_TYPED(ScPivotLayoutDialog, ToggleDestination, RadioButton&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleDestination, RadioButton&, void) { ToggleDestination(); } diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 06b663779c14..494e63020521 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -345,7 +345,7 @@ bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) // Handler: -IMPL_LINK_TYPED( ScConsolidateDlg, GetFocusHdl, Control&, rControl, void ) +IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control&, rControl, void ) { if ( &rControl ==static_cast<Control*>(pEdDataArea) || &rControl ==static_cast<Control*>(pEdDestArea)) @@ -362,7 +362,7 @@ IMPL_LINK_TYPED( ScConsolidateDlg, GetFocusHdl, Control&, rControl, void ) } } -IMPL_LINK_NOARG_TYPED(ScConsolidateDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl, Button*, void) { const sal_Int32 nDataAreaCount = pLbConsAreas->GetEntryCount(); @@ -419,7 +419,7 @@ IMPL_LINK_NOARG_TYPED(ScConsolidateDlg, OkHdl, Button*, void) Close(); // no area defined -> Cancel } -IMPL_LINK_TYPED( ScConsolidateDlg, ClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScConsolidateDlg, ClickHdl, Button*, pBtn, void ) { if ( pBtn == pBtnCancel ) Close(); @@ -483,7 +483,7 @@ IMPL_LINK_TYPED( ScConsolidateDlg, ClickHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScConsolidateDlg, SelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox&, rLb, void ) { if ( &rLb == pLbConsAreas ) { @@ -524,7 +524,7 @@ IMPL_LINK_TYPED( ScConsolidateDlg, SelectHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScConsolidateDlg, ModifyHdl, Edit&, rEd, void ) +IMPL_LINK( ScConsolidateDlg, ModifyHdl, Edit&, rEd, void ) { if ( &rEd == pEdDataArea ) { diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 89336fd92f46..aef45567bf95 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -251,7 +251,7 @@ void ScCsvTableBox::DataChanged( const DataChangedEvent& rDCEvt ) ScCsvControl::DataChanged( rDCEvt ); } -IMPL_LINK_TYPED( ScCsvTableBox, CsvCmdHdl, ScCsvControl&, rCtrl, void ) +IMPL_LINK( ScCsvTableBox, CsvCmdHdl, ScCsvControl&, rCtrl, void ) { const ScCsvCmd& rCmd = rCtrl.GetCmd(); ScCsvCmdType eType = rCmd.GetType(); @@ -388,7 +388,7 @@ IMPL_LINK_TYPED( ScCsvTableBox, CsvCmdHdl, ScCsvControl&, rCtrl, void ) } } -IMPL_LINK_TYPED( ScCsvTableBox, ScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( ScCsvTableBox, ScrollHdl, ScrollBar*, pScrollBar, void ) { OSL_ENSURE( pScrollBar, "ScCsvTableBox::ScrollHdl - missing sender" ); @@ -398,7 +398,7 @@ IMPL_LINK_TYPED( ScCsvTableBox, ScrollHdl, ScrollBar*, pScrollBar, void ) Execute( CSVCMD_SETLINEOFFSET, pScrollBar->GetThumbPos() ); } -IMPL_LINK_TYPED( ScCsvTableBox, ScrollEndHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( ScCsvTableBox, ScrollEndHdl, ScrollBar*, pScrollBar, void ) { OSL_ENSURE( pScrollBar, "ScCsvTableBox::ScrollEndHdl - missing sender" ); diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 84237ad8efc8..2fc447c3e314 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -114,7 +114,7 @@ void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc ) rDesc.bNative = ( nSelect == DP_TYPELIST_SQLNAT ); } -IMPL_LINK_NOARG_TYPED(ScDataPilotDatabaseDlg, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScDataPilotDatabaseDlg, SelectHdl, ListBox&, void) { FillObjects(); } diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 58af4920b9aa..a78442b32259 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -98,7 +98,7 @@ void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName) } } -IMPL_LINK_TYPED( ScDataPilotSourceTypeDlg, RadioClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, Button*, pBtn, void ) { m_pLbNamedRange->Enable(pBtn == m_pBtnNamedRange); } diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 0621fad5915c..8c917580587c 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -388,7 +388,7 @@ bool ScDbNameDlg::IsRefInputMode() const // Handler: -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, OkBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl, Button*, void) { AddBtnHdl( nullptr ); @@ -404,12 +404,12 @@ IMPL_LINK_NOARG_TYPED(ScDbNameDlg, OkBtnHdl, Button*, void) Close(); } -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, CancelBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScDbNameDlg, CancelBtnHdl, Button*, void) { Close(); } -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, AddBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl, Button*, void) { OUString aNewName = comphelper::string::strip(m_pEdName->GetText(), ' '); OUString aNewArea = m_pEdAssign->GetText(); @@ -508,7 +508,7 @@ public: } -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, RemoveBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl, Button*, void) { OUString aStrEntry = m_pEdName->GetText(); ScDBCollection::NamedDBs& rDBs = aLocalDbCol.getNamedDBs(); @@ -559,7 +559,7 @@ IMPL_LINK_NOARG_TYPED(ScDbNameDlg, RemoveBtnHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, NameModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl, Edit&, void) { OUString theName = m_pEdName->GetText(); bool bNameFound = (COMBOBOX_ENTRY_NOTFOUND @@ -622,7 +622,7 @@ IMPL_LINK_NOARG_TYPED(ScDbNameDlg, NameModifyHdl, Edit&, void) } } -IMPL_LINK_NOARG_TYPED(ScDbNameDlg, AssModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl, Edit&, void) { // hier parsen fuer Save() etc. diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 6ade3f464178..725311e816d4 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -92,7 +92,7 @@ void ScDPGroupEditHelper::SetValue( bool bAuto, double fValue ) ImplSetValue( fValue ); } -IMPL_LINK_TYPED( ScDPGroupEditHelper, ClickHdl, Button*, pButton, void ) +IMPL_LINK( ScDPGroupEditHelper, ClickHdl, Button*, pButton, void ) { if( pButton == mpRbAuto ) { @@ -331,7 +331,7 @@ sal_Int32 ScDPDateGroupDlg::GetDatePart() const return nDatePart; } -IMPL_LINK_TYPED( ScDPDateGroupDlg, ClickHdl, Button*, pButton, void ) +IMPL_LINK( ScDPDateGroupDlg, ClickHdl, Button*, pButton, void ) { if( pButton == mpRbNumDays ) { @@ -352,7 +352,7 @@ IMPL_LINK_TYPED( ScDPDateGroupDlg, ClickHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( ScDPDateGroupDlg, CheckHdl, SvTreeListBox*, pListBox, void ) +IMPL_LINK( ScDPDateGroupDlg, CheckHdl, SvTreeListBox*, pListBox, void ) { // enable/disable OK button on modifying check list box if( pListBox == mpLbUnits ) diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 23713771e4a8..357bb05a00eb 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -667,7 +667,7 @@ bool ScFilterDlg::IsRefInputMode() const // Handler: -IMPL_LINK_TYPED( ScFilterDlg, EndDlgHdl, Button*, pBtn, void ) +IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn, void ) { if ( pBtn == pBtnOk ) { @@ -702,7 +702,7 @@ IMPL_LINK_TYPED( ScFilterDlg, EndDlgHdl, Button*, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScFilterDlg, MoreExpandedHdl, VclExpander&, void) +IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl, VclExpander&, void) { if ( pExpander->get_expanded() ) pTimer->Start(); @@ -715,7 +715,7 @@ IMPL_LINK_NOARG_TYPED(ScFilterDlg, MoreExpandedHdl, VclExpander&, void) } } -IMPL_LINK_TYPED( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void ) +IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void ) { // Check if RefInputMode is still true every 50ms @@ -726,7 +726,7 @@ IMPL_LINK_TYPED( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void ) pTimer->Start(); } -IMPL_LINK_TYPED( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) { /* * Handle enable/disable logic depending on which ListBox was selected @@ -978,7 +978,7 @@ IMPL_LINK_TYPED( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScFilterDlg, CheckBoxHdl, Button*, pBox, void ) +IMPL_LINK( ScFilterDlg, CheckBoxHdl, Button*, pBox, void ) { // Column headers: // Field list: Columnxx <-> column header string @@ -1014,7 +1014,7 @@ IMPL_LINK_TYPED( ScFilterDlg, CheckBoxHdl, Button*, pBox, void ) } } -IMPL_LINK_TYPED( ScFilterDlg, ValModifyHdl, Edit&, rEd, void ) +IMPL_LINK( ScFilterDlg, ValModifyHdl, Edit&, rEd, void ) { size_t nOffset = GetSliderPos(); size_t i = 0; @@ -1097,7 +1097,7 @@ IMPL_LINK_TYPED( ScFilterDlg, ValModifyHdl, Edit&, rEd, void ) } } -IMPL_LINK_NOARG_TYPED(ScFilterDlg, ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ScFilterDlg, ScrollHdl, ScrollBar*, void) { SliderMoved(); } diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 0be8764e61cb..018330b702d5 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -209,7 +209,7 @@ bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const // Handler: -IMPL_LINK_TYPED( ScFilterOptionsMgr, LbAreaSelHdl, ListBox&, rLb, void ) +IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox&, rLb, void ) { if ( &rLb == pLbCopyArea ) { @@ -223,7 +223,7 @@ IMPL_LINK_TYPED( ScFilterOptionsMgr, LbAreaSelHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScFilterOptionsMgr, EdAreaModifyHdl, Edit&, rEd, void ) +IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit&, rEd, void ) { if ( &rEd == pEdCopyArea ) { @@ -249,7 +249,7 @@ IMPL_LINK_TYPED( ScFilterOptionsMgr, EdAreaModifyHdl, Edit&, rEd, void ) } } -IMPL_LINK_TYPED( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox&, rBox, void ) +IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox&, rBox, void ) { if ( &rBox == pBtnCopyResult ) { diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 0ad42d05c965..7c2b75631221 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -429,7 +429,7 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() // Handler: -IMPL_LINK_TYPED( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void ) { /* @@ -518,7 +518,7 @@ IMPL_LINK_TYPED( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScPivotFilterDlg, CheckBoxHdl, Button*, pBox, void ) +IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, Button*, pBox, void ) { // update the value lists when dealing with uppercase/lowercase @@ -539,7 +539,7 @@ IMPL_LINK_TYPED( ScPivotFilterDlg, CheckBoxHdl, Button*, pBox, void ) } } -IMPL_LINK_TYPED( ScPivotFilterDlg, ValModifyHdl, Edit&, rEd, void ) +IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, Edit&, rEd, void ) { OUString aStrVal = rEd.GetText(); ListBox* pLb = m_pLbCond1; diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 45a503829223..d947b51d4ad9 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -361,7 +361,7 @@ sal_Int32 ScDPFunctionDlg::FindBaseItemPos( const OUString& rEntry, sal_Int32 nS return bFound ? nPos : LISTBOX_ENTRY_NOTFOUND; } -IMPL_LINK_TYPED( ScDPFunctionDlg, SelectHdl, ListBox&, rLBox, void ) +IMPL_LINK( ScDPFunctionDlg, SelectHdl, ListBox&, rLBox, void ) { if( &rLBox == mpLbType ) { @@ -418,7 +418,7 @@ IMPL_LINK_TYPED( ScDPFunctionDlg, SelectHdl, ListBox&, rLBox, void ) } } -IMPL_LINK_NOARG_TYPED(ScDPFunctionDlg, DblClickHdl, ListBox&, void) +IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl, ListBox&, void) { mpBtnOk->Click(); } @@ -520,17 +520,17 @@ void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa mpBtnOptions->SetClickHdl( LINK( this, ScDPSubtotalDlg, ClickHdl ) ); } -IMPL_LINK_TYPED( ScDPSubtotalDlg, RadioClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, Button*, pBtn, void ) { mpLbFunc->Enable( pBtn == mpRbUser ); } -IMPL_LINK_NOARG_TYPED(ScDPSubtotalDlg, DblClickHdl, ListBox&, void) +IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl, ListBox&, void) { mpBtnOk->Click(); } -IMPL_LINK_TYPED( ScDPSubtotalDlg, ClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScDPSubtotalDlg, ClickHdl, Button*, pBtn, void ) { if (pBtn == mpBtnOptions) { @@ -789,12 +789,12 @@ sal_Int32 ScDPSubtotalOptDlg::FindListBoxEntry( return bFound ? nPos : LISTBOX_ENTRY_NOTFOUND; } -IMPL_LINK_TYPED( ScDPSubtotalOptDlg, RadioClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScDPSubtotalOptDlg, RadioClickHdl, Button*, pBtn, void ) { m_pLbSortBy->Enable( pBtn != m_pRbSortMan ); } -IMPL_LINK_TYPED( ScDPSubtotalOptDlg, CheckHdl, Button*, pCBox, void ) +IMPL_LINK( ScDPSubtotalOptDlg, CheckHdl, Button*, pCBox, void ) { if (pCBox == m_pCbShow) { @@ -810,7 +810,7 @@ IMPL_LINK_TYPED( ScDPSubtotalOptDlg, CheckHdl, Button*, pCBox, void ) } } -IMPL_LINK_TYPED( ScDPSubtotalOptDlg, SelectHdl, ListBox&, rLBox, void ) +IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox&, rLBox, void ) { if (&rLBox == m_pLbHierarchy) { @@ -887,7 +887,7 @@ OUString ScDPShowDetailDlg::GetDimensionName() const return mrDPObj.GetDimName(nDim, bIsDataLayout); } -IMPL_LINK_TYPED( ScDPShowDetailDlg, DblClickHdl, ListBox&, rLBox, void ) +IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox&, rLBox, void ) { if( &rLBox == mpLbDims ) mpBtnOk->Click(); diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index e775aa9e5ffa..675fdce1d82b 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -162,7 +162,7 @@ void ScNewScenarioDlg::SetScenarioData(const OUString& rName, const OUString& rC m_pCbProtect->Check ( (nFlags & ScScenarioFlags::Protected) != ScScenarioFlags::NONE ); } -IMPL_LINK_NOARG_TYPED(ScNewScenarioDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl, Button*, void) { OUString aName = comphelper::string::strip(m_pEdName->GetText(), ' '); ScDocument* pDoc = static_cast<ScTabViewShell*>(SfxViewShell::Current())->GetViewData().GetDocument(); @@ -185,7 +185,7 @@ IMPL_LINK_NOARG_TYPED(ScNewScenarioDlg, OkHdl, Button*, void) //! beim Editieren testen, ob eine andere Tabelle den Namen hat! } -IMPL_LINK_TYPED( ScNewScenarioDlg, EnableHdl, Button*, pBox, void ) +IMPL_LINK( ScNewScenarioDlg, EnableHdl, Button*, pBox, void ) { if (pBox == m_pCbShowFrame) m_pLbColor->Enable( m_pCbShowFrame->IsChecked() ); diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 3d14c9524d95..2b7f7a50cd9c 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -665,7 +665,7 @@ void ScImportAsciiDlg::UpdateVertical() mpDatStream->SetStreamCharSet(meCharSet); } -IMPL_LINK_TYPED( ScImportAsciiDlg, RbSepFixHdl, Button*, pButton, void ) +IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, Button*, pButton, void ) { OSL_ENSURE( pButton, "ScImportAsciiDlg::RbSepFixHdl - missing sender" ); @@ -682,15 +682,15 @@ IMPL_LINK_TYPED( ScImportAsciiDlg, RbSepFixHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( ScImportAsciiDlg, SeparatorClickHdl, Button*, pCtrl, void ) +IMPL_LINK( ScImportAsciiDlg, SeparatorClickHdl, Button*, pCtrl, void ) { SeparatorHdl(pCtrl); } -IMPL_LINK_TYPED( ScImportAsciiDlg, SeparatorComboBoxHdl, ComboBox&, rCtrl, void ) +IMPL_LINK( ScImportAsciiDlg, SeparatorComboBoxHdl, ComboBox&, rCtrl, void ) { SeparatorHdl(&rCtrl); } -IMPL_LINK_TYPED( ScImportAsciiDlg, SeparatorEditHdl, Edit&, rEdit, void ) +IMPL_LINK( ScImportAsciiDlg, SeparatorEditHdl, Edit&, rEdit, void ) { SeparatorHdl(&rEdit); } @@ -718,7 +718,7 @@ void ScImportAsciiDlg::SeparatorHdl( Control* pCtrl ) mpTableBox->Execute( CSVCMD_NEWCELLTEXTS ); } -IMPL_LINK_TYPED( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void ) +IMPL_LINK( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void ) { SvxTextEncodingBox* pCharSetBox = static_cast<SvxTextEncodingBox*>(&rListBox); if( (pCharSetBox == pLbCharSet) && (pCharSetBox->GetSelectEntryCount() == 1) ) @@ -735,19 +735,19 @@ IMPL_LINK_TYPED( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void ) } } -IMPL_LINK_TYPED( ScImportAsciiDlg, FirstRowHdl, Edit&, rEdit, void ) +IMPL_LINK( ScImportAsciiDlg, FirstRowHdl, Edit&, rEdit, void ) { 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 ) +IMPL_LINK( ScImportAsciiDlg, LbColTypeHdl, ListBox&, rListBox, void ) { if( &rListBox == pLbType ) mpTableBox->Execute( CSVCMD_SETCOLUMNTYPE, rListBox.GetSelectEntryPos() ); } -IMPL_LINK_NOARG_TYPED(ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox&, void) +IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox&, void) { sal_Int32 nBaseLine = mpTableBox->GetFirstVisLine(); sal_Int32 nRead = mpTableBox->GetVisLineCount(); @@ -772,7 +772,7 @@ IMPL_LINK_NOARG_TYPED(ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox&, void) mpTableBox->SetUniStrings( maPreviewLine, maFieldSeparators, mcTextSep, bMergeSep); } -IMPL_LINK_TYPED( ScImportAsciiDlg, ColTypeHdl, ScCsvTableBox&, rTableBox, void ) +IMPL_LINK( ScImportAsciiDlg, ColTypeHdl, ScCsvTableBox&, rTableBox, void ) { sal_Int32 nType = rTableBox.GetSelColumnType(); sal_Int32 nTypeCount = pLbType->GetEntryCount(); diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 485219475081..a3ae3d41bef6 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -310,7 +310,7 @@ OString ScImportOptionsDlg::GetScreenshotId() const return (m_bIsAsciiImport) ? GetHelpId() : GetHelpId() + "?config=NonTextImport"; } -IMPL_LINK_TYPED( ScImportOptionsDlg, FixedWidthHdl, Button*, pCheckBox, void ) +IMPL_LINK( ScImportOptionsDlg, FixedWidthHdl, Button*, pCheckBox, void ) { if (pCheckBox == m_pCbFixed) { @@ -324,7 +324,7 @@ IMPL_LINK_TYPED( ScImportOptionsDlg, FixedWidthHdl, Button*, pCheckBox, void ) } } -IMPL_LINK_TYPED( ScImportOptionsDlg, DoubleClickHdl, ListBox&, rLb, void ) +IMPL_LINK( ScImportOptionsDlg, DoubleClickHdl, ListBox&, rLb, void ) { if (&rLb == m_pLbCharset) { diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 2a3e82d386fb..e49bf82a24b5 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -280,7 +280,7 @@ bool ScSpecialFilterDlg::IsRefInputMode() const // Handler: -IMPL_LINK_TYPED( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void ) +IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void ) { OSL_ENSURE( pDoc && pViewData, "Document or ViewData not found. :-/" ); @@ -396,7 +396,7 @@ IMPL_LINK_TYPED( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void ) +IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void ) { // every 50ms check whether RefInputMode is still true @@ -422,7 +422,7 @@ IMPL_LINK_TYPED( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void ) pIdle->Start(); } -IMPL_LINK_TYPED( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void ) +IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void ) { if ( &rLb == pLbFilterArea ) { @@ -436,7 +436,7 @@ IMPL_LINK_TYPED( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScSpecialFilterDlg, FilterAreaModHdl, Edit&, rEd, void ) +IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, Edit&, rEd, void ) { if ( &rEd == pEdFilterArea ) { diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 86ff8096d09c..877002169a13 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -63,7 +63,7 @@ void ScSortWarningDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( ScSortWarningDlg, BtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScSortWarningDlg, BtnHdl, Button*, pBtn, void ) { if ( pBtn == aBtnExtSort ) { diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 6b728fa3a4af..2d11da450c9f 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -123,7 +123,7 @@ void ScSortKeyCtrl::setScrollRange() checkAutoVScroll(); } -IMPL_LINK_TYPED( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar, void ) { sal_Int32 nOffset = m_aSortWin.GetItemHeight(); nOffset *= pScrollBar->GetThumbPos(); diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index ffa0238f692a..6fa2c27113aa 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -47,7 +47,7 @@ void ScSubTotalDlg::dispose() SfxTabDialog::dispose(); } -IMPL_LINK_TYPED( ScSubTotalDlg, RemoveHdl, Button *, pBtn, void ) +IMPL_LINK( ScSubTotalDlg, RemoveHdl, Button *, pBtn, void ) { if (pBtn == m_pBtnRemove) { diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index f6d1bdfce5ef..69d6ffc4dc71 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -88,12 +88,12 @@ void ScTextImportOptionsDlg::init() m_pLbCustomLang->Disable(); } -IMPL_LINK_NOARG_TYPED(ScTextImportOptionsDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(ScTextImportOptionsDlg, OKHdl, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_TYPED( ScTextImportOptionsDlg, RadioHdl, Button*, pBtn, void ) +IMPL_LINK( ScTextImportOptionsDlg, RadioHdl, Button*, pBtn, void ) { if (pBtn == m_pRbAutomatic) { diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 01bd5346928a..147a35e0020c 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -438,7 +438,7 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem ) // Handler: -IMPL_LINK_TYPED( ScTabPageSortFields, SelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox&, rLb, void ) { OUString aSelEntry = rLb.GetSelectEntry(); ScSortKeyItems::iterator pIter; @@ -841,7 +841,7 @@ void ScTabPageSortOptions::FillUserSortListBox() // Handler: -IMPL_LINK_TYPED( ScTabPageSortOptions, EnableHdl, Button*, pButton, void ) +IMPL_LINK( ScTabPageSortOptions, EnableHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if (pBox == m_pBtnCopyResult) @@ -870,7 +870,7 @@ IMPL_LINK_TYPED( ScTabPageSortOptions, EnableHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( ScTabPageSortOptions, SelOutPosHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox&, rLb, void ) { if (&rLb == m_pLbOutPos) { @@ -884,7 +884,7 @@ IMPL_LINK_TYPED( ScTabPageSortOptions, SelOutPosHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScTabPageSortOptions, SortDirHdl, Button *, pBtn, void ) +IMPL_LINK( ScTabPageSortOptions, SortDirHdl, Button *, pBtn, void ) { if (pBtn == m_pBtnTopDown) { @@ -923,7 +923,7 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) } } -IMPL_LINK_NOARG_TYPED(ScTabPageSortOptions, FillAlgorHdl, ListBox&, void) +IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl, ListBox&, void) { m_pLbAlgorithm->SetUpdateMode( false ); m_pLbAlgorithm->Clear(); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index c483f460630f..e6c8c7c33264 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -342,11 +342,11 @@ sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) // Handler: -IMPL_LINK_TYPED( ScTpSubTotalGroup, SelectTreeListBoxHdl, SvTreeListBox*, pLb, void ) +IMPL_LINK( ScTpSubTotalGroup, SelectTreeListBoxHdl, SvTreeListBox*, pLb, void ) { SelectHdl(pLb); } -IMPL_LINK_TYPED( ScTpSubTotalGroup, SelectListBoxHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTpSubTotalGroup, SelectListBoxHdl, ListBox&, rLb, void ) { SelectHdl(&rLb); } @@ -375,7 +375,7 @@ void ScTpSubTotalGroup::SelectHdl(void *pLb) } } -IMPL_LINK_TYPED( ScTpSubTotalGroup, CheckHdl, SvTreeListBox*, pLb, void ) +IMPL_LINK( ScTpSubTotalGroup, CheckHdl, SvTreeListBox*, pLb, void ) { if ( pLb == mpLbColumns ) { @@ -570,7 +570,7 @@ void ScTpSubTotalOptions::FillUserSortListBox() // Handler: -IMPL_LINK_TYPED( ScTpSubTotalOptions, CheckHdl, Button*, pBox, void ) +IMPL_LINK( ScTpSubTotalOptions, CheckHdl, Button*, pBox, void ) { if ( pBox == pBtnSort ) { diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 7a504b87cc06..8add8fcba032 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -581,7 +581,7 @@ void ScTPValidationValue::RemoveRefDlg() } } -IMPL_LINK_NOARG_TYPED(ScTPValidationValue, EditSetFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl, Control&, void) { const sal_Int32 nPos = m_pLbAllow->GetSelectEntryPos(); @@ -591,7 +591,7 @@ IMPL_LINK_NOARG_TYPED(ScTPValidationValue, EditSetFocusHdl, Control&, void) } } -IMPL_LINK_TYPED( ScTPValidationValue, KillFocusHdl, Control&, rControl, void ) +IMPL_LINK( ScTPValidationValue, KillFocusHdl, Control&, rControl, void ) { vcl::Window* pWnd = static_cast<vcl::Window*>(&rControl); if( pWnd == m_pRefEdit || pWnd == m_pBtnRef ) @@ -603,7 +603,7 @@ IMPL_LINK_TYPED( ScTPValidationValue, KillFocusHdl, Control&, rControl, void ) } } -IMPL_LINK_NOARG_TYPED(ScTPValidationValue, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl, ListBox&, void) { const sal_Int32 nLbPos = m_pLbAllow->GetSelectEntryPos(); bool bEnable = (nLbPos != SC_VALIDDLG_ALLOW_ANY); @@ -665,7 +665,7 @@ IMPL_LINK_NOARG_TYPED(ScTPValidationValue, SelectHdl, ListBox&, void) m_pBtnRef->Show( bRange ); // cell range picker } -IMPL_LINK_NOARG_TYPED(ScTPValidationValue, CheckHdl, Button*, void) +IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl, Button*, void) { m_pCbSort->Enable( m_pCbShow->IsChecked() ); } @@ -830,7 +830,7 @@ bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet ) return true; } -IMPL_LINK_NOARG_TYPED(ScTPValidationError, SelectActionHdl, ListBox&, void) +IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl, ListBox&, void) { ScValidErrorStyle eStyle = (ScValidErrorStyle) m_pLbAction->GetSelectEntryPos(); bool bMacro = ( eStyle == SC_VALERR_MACRO ); @@ -840,7 +840,7 @@ IMPL_LINK_NOARG_TYPED(ScTPValidationError, SelectActionHdl, ListBox&, void) m_pEdError->Enable( !bMacro ); } -IMPL_LINK_NOARG_TYPED(ScTPValidationError, ClickSearchHdl, Button*, void) +IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl, Button*, void) { // Use static SfxApplication method to bring up selector dialog for // choosing a script diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index c6e747084a6f..243fb2a61549 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -126,7 +126,7 @@ bool SearchResultsDlg::Close() return ModelessDialog::Close(); } -IMPL_LINK_NOARG_TYPED( SearchResultsDlg, ListSelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl, SvTreeListBox*, void ) { if (!mpDoc) return; diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 423c063b5047..e37a237a4eb8 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -477,12 +477,12 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, return bCanDo; } -IMPL_LINK_NOARG_TYPED(ScAreaLink, RefreshHdl, Timer *, void) +IMPL_LINK_NOARG(ScAreaLink, RefreshHdl, Timer *, void) { Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelay() ); } -IMPL_LINK_NOARG_TYPED(ScAreaLink, AreaEndEditHdl, Dialog&, void) +IMPL_LINK_NOARG(ScAreaLink, AreaEndEditHdl, Dialog&, void) { // #i76514# can't use link argument to access the dialog, // because it's the ScLinkedAreaDlg, not AbstractScLinkedAreaDlg diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 463b88bcd314..3888dbcbcea4 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -81,7 +81,7 @@ void ScAutoStyleList::AddInitial( const ScRange& rRange, const OUString& rStyle1 aInitIdle.Start(); } -IMPL_LINK_NOARG_TYPED(ScAutoStyleList, InitHdl, Idle *, void) +IMPL_LINK_NOARG(ScAutoStyleList, InitHdl, Idle *, void) { std::vector<ScAutoStyleInitData>::iterator iter; for (iter = aInitials.begin(); iter != aInitials.end(); ++iter) @@ -184,7 +184,7 @@ void ScAutoStyleList::StartTimer( sal_uLong nNow ) // Sekunden nTimerStart = nNow; } -IMPL_LINK_NOARG_TYPED(ScAutoStyleList, TimerHdl, Timer *, void) +IMPL_LINK_NOARG(ScAutoStyleList, TimerHdl, Timer *, void) { sal_uLong nNow = TimeNow(); AdjustEntries(aTimer.GetTimeout()); // eingestellte Wartezeit diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index cd78c5394525..9c6c869a8e28 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -585,7 +585,7 @@ bool DataStream::ImportData() return mbRunning; } -IMPL_LINK_NOARG_TYPED(DataStream, ImportTimerHdl, Timer *, void) +IMPL_LINK_NOARG(DataStream, ImportTimerHdl, Timer *, void) { if (ImportData()) maImportTimer.Start(); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 833f63771880..e75dca660985 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -98,7 +98,7 @@ using namespace com::sun::star; using ::std::vector; -IMPL_LINK_TYPED( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction, void ) +IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction, void ) { // #i101118# if drawing layer collects the undo actions, add it there ScDrawLayer* pDrawLayer = rDocShell.GetDocument().GetDrawLayer(); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 050ed5c6c52d..26ac1ab2f238 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2305,7 +2305,7 @@ ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo ) // static return pFound; } -IMPL_LINK_TYPED( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { OSL_ENSURE( _pFileDlg, "ScDocShell::DialogClosedHdl(): no file dialog" ); OSL_ENSURE( pImpl->pDocInserter, "ScDocShell::DialogClosedHdl(): no document inserter" ); diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index fad11592f7e4..d3437b8c5dcb 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -996,7 +996,7 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec return true; } -IMPL_LINK_TYPED( ScDocShell, RefreshDBDataHdl, Timer*, pRefreshTimer, void ) +IMPL_LINK( ScDocShell, RefreshDBDataHdl, Timer*, pRefreshTimer, void ) { ScDBDocFunc aFunc(*this); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 8c496a0d36cb..fdb84ef5feb2 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -3203,7 +3203,7 @@ void ScExternalRefManager::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -IMPL_LINK_TYPED(ScExternalRefManager, TimeOutHdl, Timer*, pTimer, void) +IMPL_LINK(ScExternalRefManager, TimeOutHdl, Timer*, pTimer, void) { if (pTimer == &maSrcDocTimer) purgeStaleSrcDocument(SRCDOC_LIFE_SPAN); diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index d16ae51697fc..5c2ff38af891 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -399,12 +399,12 @@ bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilter, return true; } -IMPL_LINK_NOARG_TYPED(ScTableLink, RefreshHdl, Timer *, void) +IMPL_LINK_NOARG(ScTableLink, RefreshHdl, Timer *, void) { Refresh( aFileName, aFilterName, nullptr, GetRefreshDelay() ); } -IMPL_LINK_TYPED( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink&, rLink, void ) +IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink&, rLink, void ) { pImpl->m_aEndEditLink.Call( rLink ); bInEdit = false; diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index a5e1ca4f125d..cf4f4542e892 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -612,7 +612,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) } } -IMPL_LINK_TYPED( ScDrawShell, NameObjectHdl, AbstractSvxObjectNameDialog&, rDialog, bool ) +IMPL_LINK( ScDrawShell, NameObjectHdl, AbstractSvxObjectNameDialog&, rDialog, bool ) { OUString aName; rDialog.GetName( aName ); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 3e428457f632..7f74fb4c1239 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -470,7 +470,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) } } -IMPL_LINK_TYPED( ScDrawTextObjectBar, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) +IMPL_LINK( ScDrawTextObjectBar, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) { bPastePossible = ( pDataHelper->HasFormat( SotClipboardFormatId::STRING ) || pDataHelper->HasFormat( SotClipboardFormatId::RTF ) ); diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 73965e639051..94829ea52ec9 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -126,7 +126,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) |* \************************************************************************/ -IMPL_LINK_NOARG_TYPED(FuPoor, ScrollHdl, Timer *, void) +IMPL_LINK_NOARG(FuPoor, ScrollHdl, Timer *, void) { Point aPosPixel = pWindow->GetPointerPosPixel(); @@ -191,7 +191,7 @@ sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt) |* Timer-Handler fuer Drag&Drop |* \************************************************************************/ -IMPL_LINK_NOARG_TYPED(FuPoor, DragTimerHdl, Timer *, void) +IMPL_LINK_NOARG(FuPoor, DragTimerHdl, Timer *, void) { // ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer // aufzurufen, bringt die VCL-Timer-Verwaltung durcheinander, wenn dabei @@ -203,7 +203,7 @@ IMPL_LINK_NOARG_TYPED(FuPoor, DragTimerHdl, Timer *, void) Application::PostUserEvent( LINK( this, FuPoor, DragHdl ) ); } -IMPL_LINK_NOARG_TYPED(FuPoor, DragHdl, void*, void) +IMPL_LINK_NOARG(FuPoor, DragHdl, void*, void) { SdrHdl* pHdl = pView->PickHandle(aMDPos); diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 8a36f6d64ca2..11f9ab7bf373 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -604,7 +604,7 @@ void ScFunctionWin::DoEnter() #* #************************************************************************/ -IMPL_LINK_TYPED( ScFunctionWin, SelHdl, ListBox&, rLb, void ) +IMPL_LINK( ScFunctionWin, SelHdl, ListBox&, rLb, void ) { if ( &rLb == aCatBox.get() ) { @@ -633,11 +633,11 @@ IMPL_LINK_TYPED( ScFunctionWin, SelHdl, ListBox&, rLb, void ) #* #************************************************************************/ -IMPL_LINK_NOARG_TYPED( ScFunctionWin, SetSelectionClickHdl, Button*, void ) +IMPL_LINK_NOARG( ScFunctionWin, SetSelectionClickHdl, Button*, void ) { DoEnter(); // Uebernimmt die Eingabe } -IMPL_LINK_NOARG_TYPED( ScFunctionWin, SetSelectionHdl, ListBox&, void ) +IMPL_LINK_NOARG( ScFunctionWin, SetSelectionHdl, ListBox&, void ) { DoEnter(); // Uebernimmt die Eingabe } @@ -657,7 +657,7 @@ IMPL_LINK_NOARG_TYPED( ScFunctionWin, SetSelectionHdl, ListBox&, void ) #* #************************************************************************/ -IMPL_LINK_TYPED( ScFunctionWin, SetSplitHdl, ScPrivatSplit&, rCtrl, void ) +IMPL_LINK( ScFunctionWin, SetSplitHdl, ScPrivatSplit&, rCtrl, void ) { if (&rCtrl == aPrivatSplit.get()) { @@ -675,7 +675,7 @@ IMPL_LINK_TYPED( ScFunctionWin, SetSplitHdl, ScPrivatSplit&, rCtrl, void ) } } -IMPL_LINK_NOARG_TYPED(ScFunctionWin, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScFunctionWin, TimerHdl, Idle *, void) { OUString aString("ww"); Size aTxtSize( aFiFuncDesc->GetTextWidth(aString), aFiFuncDesc->GetTextHeight() ); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index e7e1897c21ec..9a2807d54336 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -66,7 +66,7 @@ public: virtual void Init() override; - DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowChildEventListener, VclWindowEvent&, void ); protected: virtual ~ScAccessibleDocument() override; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index b31a4da2e31e..6390df7fbedf 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -54,7 +54,7 @@ public: SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; } virtual void UpdateData() = 0; - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); private: mutable SfxBroadcaster maBroadcaster; @@ -119,7 +119,7 @@ public: virtual void UpdateData() override { } - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); protected: ScEditObjectViewForwarder* mpViewForwarder; ScEditViewForwarder* mpEditViewForwarder; diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index f9a139422285..49b1efab696c 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -38,7 +38,7 @@ private: VclPtr<RadioButton> mpTwoFactorRadio; VclPtr<NumericField> mpRowsPerSampleField; - DECL_LINK_TYPED(FactorChanged, RadioButton&, void); + DECL_LINK(FactorChanged, RadioButton&, void); void FactorChanged(); AnovaFactor meFactor; diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 9a417edf1d25..e746df2d23b2 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -86,14 +86,14 @@ private: ScAddress::Details maAddressDetails; bool mbDialogLostFocus; - DECL_LINK_TYPED(CancelClicked, Button*, void); - DECL_LINK_TYPED(OKClicked, Button*, void); - DECL_LINK_TYPED(GetFocusHandler, Control&, void); - DECL_LINK_TYPED(LoseFocusHandler, Control&, void); - DECL_LINK_TYPED(ToggleSource, RadioButton&, void); - DECL_LINK_TYPED(ToggleDestination, RadioButton&, void); - DECL_LINK_TYPED(SourceListSelected, ListBox&, void); - DECL_LINK_TYPED(SourceEditModified, Edit&, void); + DECL_LINK(CancelClicked, Button*, void); + DECL_LINK(OKClicked, Button*, void); + DECL_LINK(GetFocusHandler, Control&, void); + DECL_LINK(LoseFocusHandler, Control&, void); + DECL_LINK(ToggleSource, RadioButton&, void); + DECL_LINK(ToggleDestination, RadioButton&, void); + DECL_LINK(SourceListSelected, ListBox&, void); + DECL_LINK(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 1b7db2f3fa76..87821f4e6341 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -70,17 +70,17 @@ private: void SelectGeneratorAndGenerateNumbers(); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( CloseClicked, Button*, void ); - DECL_LINK_TYPED( ApplyClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, 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 ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( CloseClicked, Button*, void ); + DECL_LINK( ApplyClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + + DECL_LINK( InputRangeModified, Edit&, void ); + DECL_LINK( Parameter1ValueModified, Edit&, void ); + DECL_LINK( Parameter2ValueModified, Edit&, void ); + DECL_LINK( DistributionChanged, ListBox&, void ); + DECL_LINK( CheckChanged, CheckBox&, void ); }; diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 356477484c2d..e3f267fe62a5 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -72,12 +72,12 @@ private: ScRange PerformRandomSampling(ScDocShell* pDocShell); ScRange PerformPeriodicSampling(ScDocShell* pDocShell); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK_TYPED( SamplingSizeValueModified, Edit&, void ); - DECL_LINK_TYPED( ToggleSamplingMethod, RadioButton&, void ); - DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + DECL_LINK( SamplingSizeValueModified, Edit&, void ); + DECL_LINK( ToggleSamplingMethod, RadioButton&, void ); + DECL_LINK( RefInputModifyHandler, Edit&, void ); void ToggleSamplingMethod(); }; diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index 2f6a42710613..8a55f5dd9857 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -79,11 +79,11 @@ private: void Init(); void GetRangeFromSelection(); - DECL_LINK_TYPED( GroupByChanged, RadioButton&, void ); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); + DECL_LINK( GroupByChanged, RadioButton&, void ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + DECL_LINK( RefInputModifyHandler, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 30ffdc183c51..ac15249d25c5 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -82,11 +82,11 @@ private: void Init(); void GetRangeFromSelection(); - DECL_LINK_TYPED( GroupByChanged, RadioButton&, void ); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); + DECL_LINK( GroupByChanged, RadioButton&, void ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + DECL_LINK( RefInputModifyHandler, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 66a6e33bd4eb..8d036f7adf85 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -95,21 +95,21 @@ private: void Init(); void InitFilter(); - DECL_LINK_TYPED( FilterHandle, SvxTPFilter*, void ); - DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void ); - DECL_LINK_TYPED( RejectHandle, SvxTPView*, void ); - DECL_LINK_TYPED( AcceptHandle, SvxTPView*, void ); - DECL_LINK_TYPED( RejectAllHandle, SvxTPView*, void ); - DECL_LINK_TYPED( AcceptAllHandle, SvxTPView*, void ); - DECL_LINK_TYPED( ExpandingHandle, SvTreeListBox*, bool ); - DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void ); - DECL_LINK_TYPED( RefInfoHandle, const OUString*, void ); - - DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void ); - DECL_LINK_TYPED( ChgTrackModHdl, ScChangeTrack&, void ); - DECL_LINK_TYPED( CommandHdl, SvSimpleTable*, void ); - DECL_LINK_TYPED( ReOpenTimerHdl, Idle*, void ); - DECL_LINK_TYPED( ColCompareHdl, const SvSortData*, sal_Int32 ); + DECL_LINK( FilterHandle, SvxTPFilter*, void ); + DECL_LINK( RefHandle, SvxTPFilter*, void ); + DECL_LINK( RejectHandle, SvxTPView*, void ); + DECL_LINK( AcceptHandle, SvxTPView*, void ); + DECL_LINK( RejectAllHandle, SvxTPView*, void ); + DECL_LINK( AcceptAllHandle, SvxTPView*, void ); + DECL_LINK( ExpandingHandle, SvTreeListBox*, bool ); + DECL_LINK( SelectHandle, SvTreeListBox*, void ); + DECL_LINK( RefInfoHandle, const OUString*, void ); + + DECL_LINK( UpdateSelectionHdl, Idle*, void ); + DECL_LINK( ChgTrackModHdl, ScChangeTrack&, void ); + DECL_LINK( CommandHdl, SvSimpleTable*, void ); + DECL_LINK( ReOpenTimerHdl, Idle*, void ); + DECL_LINK( ColCompareHdl, const SvSortData*, sal_Int32 ); protected: diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index cbad65a67d84..1d53ce0dfddb 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -69,7 +69,7 @@ class ScFormulaReferenceHelper bool bHighlightRef; bool bAccInserted; - DECL_LINK_TYPED( AccelSelectHdl, Accelerator&, void ); + DECL_LINK( AccelSelectHdl, Accelerator&, void ); public: ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings); @@ -121,7 +121,7 @@ private: Idle aIdle; OUString aDocName; // document on which the dialog was opened - DECL_LINK_TYPED( UpdateFocusHdl, Idle*, void ); + DECL_LINK( UpdateFocusHdl, Idle*, void ); protected: void disposeRefHandler(); diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 2691571bc29b..6ad979c6243e 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -73,10 +73,10 @@ private: bool Impl_GetItem( Edit* pEd, SfxStringItem& rItem ); // Handler: - DECL_LINK_TYPED( Impl_SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( Impl_ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( Impl_BtnHdl, Button*, void ); - DECL_LINK_TYPED( Impl_GetFocusHdl, Control&, void ); + DECL_LINK( Impl_SelectHdl, ListBox&, void ); + DECL_LINK( Impl_ModifyHdl, Edit&, void ); + DECL_LINK( Impl_BtnHdl, Button*, void ); + DECL_LINK( Impl_GetFocusHdl, Control&, void ); }; #endif diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 7e60e75946be..d32ff75ddeff 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -37,7 +37,7 @@ protected: virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) override; private: - DECL_LINK_TYPED( OkHandler, SfxPoolItem*, void ); // for closing by double clicking in TabPages + DECL_LINK( OkHandler, SfxPoolItem*, void ); // for closing by double clicking in TabPages sal_uInt16 m_nNumberPageId; sal_uInt16 m_nFontPageId; }; diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index caf2d45dbea0..ff078209911b 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -63,8 +63,8 @@ private: void ExecuteEntries(); void AdjustEntries(sal_uLong nDiff); void StartTimer(sal_uLong nNow); - DECL_LINK_TYPED( TimerHdl, Timer*, void ); - DECL_LINK_TYPED( InitHdl, Idle*, void ); + DECL_LINK( TimerHdl, Timer*, void ); + DECL_LINK( InitHdl, Idle*, void ); public: ScAutoStyleList(ScDocShell* pShell); diff --git a/sc/source/ui/inc/cbnumberformat.hxx b/sc/source/ui/inc/cbnumberformat.hxx index f593ccf900e9..9773fd9b34cc 100644 --- a/sc/source/ui/inc/cbnumberformat.hxx +++ b/sc/source/ui/inc/cbnumberformat.hxx @@ -28,7 +28,7 @@ public: explicit ScNumberFormat(vcl::Window* pParent, WinBits nStyle); private: - DECL_STATIC_LINK_TYPED(ScNumberFormat, NumFormatSelectHdl, ListBox&, void); + DECL_STATIC_LINK(ScNumberFormat, NumFormatSelectHdl, ListBox&, void); }; #endif diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index 8bb339ed97a5..d3fa6a0bc05a 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -64,8 +64,8 @@ private: void ExecuteFillSingleEdit(); - DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void ); - DECL_LINK_TYPED( DialogClosed, Dialog&, void ); + DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( DialogClosed, Dialog&, void ); RotateTransliteration m_aRotateCase; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 856a607f4590..44a0da483918 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -165,7 +165,7 @@ private: VclPtr<ScMenuFloatingWindow> mpSubMenu; size_t mnMenuPos; - DECL_LINK_TYPED( TimeoutHdl, Timer*, void ); + DECL_LINK( TimeoutHdl, Timer*, void ); SubMenuItemData(ScMenuFloatingWindow* pParent); void reset(); @@ -392,10 +392,10 @@ private: void selectCurrentMemberOnly(bool bSet); void updateMemberParents( SvTreeListEntry* pLeaf, size_t nIdx ); - DECL_LINK_TYPED( ButtonHdl, Button*, void ); - DECL_LINK_TYPED( TriStateHdl, Button*, void ); - DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( EdModifyHdl, Edit&, void ); + DECL_LINK( ButtonHdl, Button*, void ); + DECL_LINK( TriStateHdl, Button*, void ); + DECL_LINK( CheckHdl, SvTreeListBox*, void ); + DECL_LINK( EdModifyHdl, Edit&, void ); private: VclPtr<ScSearchEdit> maEdSearch; diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index 1e2e542d5c40..682be33c87ad 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -49,9 +49,9 @@ private: ScDocument* mpDoc; ScAddress maPos; - DECL_LINK_TYPED(OkBtnHdl, Button*, void); - DECL_LINK_TYPED(TypeSelectHdl, ListBox&, void); - DECL_LINK_TYPED(PosSelectHdl, ListBox&, void); + DECL_LINK(OkBtnHdl, Button*, void); + DECL_LINK(TypeSelectHdl, ListBox&, void); + DECL_LINK(PosSelectHdl, ListBox&, void); void Init(); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 34c6f3fc2297..62f37584fe19 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -71,14 +71,14 @@ public: ScConditionalFormat* GetConditionalFormat() const; void RecalcAll(); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( EntrySelectHdl, ScCondFrmtEntry&, void ); - - DECL_LINK_TYPED( TypeListHdl, ListBox&, void ); - DECL_LINK_TYPED( AfterTypeListHdl, void*, void ); - DECL_LINK_TYPED( ColFormatTypeHdl, ListBox&, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( EntrySelectHdl, ScCondFrmtEntry&, void ); + + DECL_LINK( TypeListHdl, ListBox&, void ); + DECL_LINK( AfterTypeListHdl, void*, void ); + DECL_LINK( ColFormatTypeHdl, ListBox&, void ); }; class ScCondFormatDlg : public ScAnyRefDlg @@ -105,7 +105,7 @@ private: OUString msBaseTitle; void updateTitle(); - DECL_LINK_TYPED( EdRangeModifyHdl, Edit&, void ); + DECL_LINK( EdRangeModifyHdl, Edit&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; @@ -128,8 +128,8 @@ public: void InvalidateRefData(); - DECL_LINK_TYPED( BtnPressedHdl, Button*, void ); - DECL_LINK_TYPED( RangeGetFocusHdl, Control&, void ); + DECL_LINK( BtnPressedHdl, Button*, void ); + DECL_LINK( RangeGetFocusHdl, Control&, void ); }; #endif diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 675abc99db33..d5c99b72ad9f 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -100,9 +100,9 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener virtual OUString GetExpressionString() override; void Init(ScCondFormatDlg* pDialogParent); - DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ConditionTypeSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( OnEdChanged, Edit&, void ); + DECL_LINK( StyleSelectHdl, ListBox&, void ); + DECL_LINK( ConditionTypeSelectHdl, ListBox&, void ); + DECL_LINK( OnEdChanged, Edit&, void ); // Searches the lookup table for the entry position, given condition mode static sal_Int32 ConditionModeToEntryPos( ScConditionMode eMode ); @@ -142,7 +142,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(ScCondFormatDlg* pDialogParent); - DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); + DECL_LINK( StyleSelectHdl, ListBox&, void ); public: ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* PDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = nullptr ); @@ -176,7 +176,7 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(); - DECL_LINK_TYPED( EntryTypeHdl, ListBox&, void ); + DECL_LINK( EntryTypeHdl, ListBox&, void ); public: ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = nullptr ); virtual ~ScColorScale2FrmtEntry() override; @@ -211,7 +211,7 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(); - DECL_LINK_TYPED( EntryTypeHdl, ListBox&, void ); + DECL_LINK( EntryTypeHdl, ListBox&, void ); public: ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = nullptr ); virtual ~ScColorScale3FrmtEntry() override; @@ -242,8 +242,8 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(); - DECL_LINK_TYPED( OptionBtnHdl, Button*, void ); - DECL_LINK_TYPED( DataBarTypeSelectHdl, ListBox&, void ); + DECL_LINK( OptionBtnHdl, Button*, void ); + DECL_LINK( DataBarTypeSelectHdl, ListBox&, void ); public: ScDataBarFrmtEntry( vcl::Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = nullptr ); virtual ~ScDataBarFrmtEntry() override; @@ -274,7 +274,7 @@ protected: private: void Init(); - DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); + DECL_LINK( StyleSelectHdl, ListBox&, void ); VclPtr<ListBox> maLbDateEntry; VclPtr<FixedText> maFtStyle; @@ -299,7 +299,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry void Init(); - DECL_LINK_TYPED( IconSetTypeHdl, ListBox&, void ); + DECL_LINK( IconSetTypeHdl, ListBox&, void ); public: ScIconSetFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat = nullptr ); diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index f436ca81e7e2..fffd18f8bdc3 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -67,10 +67,10 @@ private: ScDocument* mpDoc; - DECL_LINK_TYPED(RemoveBtnHdl, Button*, void); - DECL_LINK_TYPED(EditBtnClickHdl, Button*, void); - DECL_LINK_TYPED(AddBtnHdl, Button*, void); - DECL_LINK_TYPED(EditBtnHdl, SvTreeListBox*, bool); + DECL_LINK(RemoveBtnHdl, Button*, void); + DECL_LINK(EditBtnClickHdl, Button*, void); + DECL_LINK(AddBtnHdl, Button*, void); + DECL_LINK(EditBtnHdl, SvTreeListBox*, bool); bool mbModified; }; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index a8582a1081ac..db53e0915cf2 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -149,13 +149,13 @@ private: void KeepHandler( bool bMine ); void KeepAllHandler( bool bMine ); - DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void ); - DECL_LINK_TYPED( DeselectHandle, SvTreeListBox*, void ); - DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void ); - DECL_LINK_TYPED( KeepMineHandle, Button*, void ); - DECL_LINK_TYPED( KeepOtherHandle, Button*, void ); - DECL_LINK_TYPED( KeepAllMineHandle, Button*, void ); - DECL_LINK_TYPED( KeepAllOthersHandle, Button*, void ); + DECL_LINK( SelectHandle, SvTreeListBox*, void ); + DECL_LINK( DeselectHandle, SvTreeListBox*, void ); + DECL_LINK( UpdateSelectionHdl, Idle*, void ); + DECL_LINK( KeepMineHandle, Button*, void ); + DECL_LINK( KeepOtherHandle, Button*, void ); + DECL_LINK( KeepAllMineHandle, Button*, void ); + DECL_LINK( KeepAllOthersHandle, Button*, void ); public: ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index b3938dc49af4..ecd20847dccd 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -91,11 +91,11 @@ private: void FillAreaLists (); bool VerifyEdit ( formula::RefEdit* pEd ); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); static ScSubTotalFunc LbPosToFunc( sal_Int32 nPos ); static sal_Int32 FuncToLbPos( ScSubTotalFunc eFunc ); diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index d1fa598153e6..8e839c1ace8c 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -98,8 +98,8 @@ class ScContentTree : public SvTreeListBox ScDocument* GetSourceDocument(); - DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ExecDragHdl, void*, void ); + DECL_LINK( ContentDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( ExecDragHdl, void*, void ); public: SvTreeListEntry* pTmpEntry; diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index ab4d7d7b6932..faf4e4b11037 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -38,7 +38,7 @@ private: VclPtr<RadioButton> m_pBtnCols; VclPtr<OKButton> m_pBtnOk; - DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_LINK(OkHdl, Button*, void); }; #endif diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 5804859bf7bf..6bffcb7d059f 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -77,17 +77,17 @@ private: void UpdateRangeData ( const ScRange& rRange, bool bColName ); void SetColRowData( const ScRange& rLabelRange, bool bRef=false); void AdjustColRowData( const ScRange& rDataRange, bool bRef=false); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); - DECL_LINK_TYPED( Range1SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( Range1DataModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ColClickHdl, Button*, void ); - DECL_LINK_TYPED( RowClickHdl, Button*, void ); - DECL_LINK_TYPED( Range2DataModifyHdl, Edit&, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( OkBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( Range1SelectHdl, ListBox&, void ); + DECL_LINK( Range1DataModifyHdl, Edit&, void ); + DECL_LINK( ColClickHdl, Button*, void ); + DECL_LINK( RowClickHdl, Button*, void ); + DECL_LINK( Range2DataModifyHdl, Edit&, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_CRNRDLG_HXX diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index b75c306fdda0..abd88e133677 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -123,9 +123,9 @@ protected: virtual Size GetOptimalSize() const override; private: - DECL_DLLPRIVATE_LINK_TYPED( CsvCmdHdl, ScCsvControl&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollEndHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( CsvCmdHdl, ScCsvControl&, void ); + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( ScrollEndHdl, ScrollBar*, void ); // accessibility ---------------------------------------------------------- public: diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index a1b9a277e95e..6216d4f6fc2f 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -36,7 +36,7 @@ private: void FillObjects(); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); public: ScDataPilotDatabaseDlg(vcl::Window* pParent); diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 3ffaef9c5974..dce9670d757f 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -46,7 +46,7 @@ public: void AppendNamedRange(const OUString& rNames); private: - DECL_LINK_TYPED( RadioClickHdl, Button *, void ); + DECL_LINK( RadioClickHdl, Button *, void ); }; class ScDataPilotServiceDlg : public ModalDialog diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 4317ef27fbda..754289bc88d1 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -63,16 +63,16 @@ private: void SetButtonState(); // Handler: - DECL_LINK_TYPED(Impl_NewHdl, Button*, void); - DECL_LINK_TYPED(Impl_PrevHdl, Button*, void); - DECL_LINK_TYPED(Impl_NextHdl, Button*, void); + DECL_LINK(Impl_NewHdl, Button*, void); + DECL_LINK(Impl_PrevHdl, Button*, void); + DECL_LINK(Impl_NextHdl, Button*, void); - DECL_LINK_TYPED(Impl_RestoreHdl, Button*, void); - DECL_LINK_TYPED(Impl_DeleteHdl, Button*, void); - DECL_LINK_TYPED(Impl_CloseHdl, Button*, void); + DECL_LINK(Impl_RestoreHdl, Button*, void); + DECL_LINK(Impl_DeleteHdl, Button*, void); + DECL_LINK(Impl_CloseHdl, Button*, void); - DECL_LINK_TYPED(Impl_ScrollHdl, ScrollBar*, void); - DECL_LINK_TYPED(Impl_DataModifyHdl, Edit&, void); + DECL_LINK(Impl_ScrollHdl, ScrollBar*, void); + DECL_LINK(Impl_DataModifyHdl, Edit&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_DATAFDLG_HXX diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index c60bec047ab2..5ddf9ac7a55e 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -99,7 +99,7 @@ private: void Text2Doc(); void Refresh(); - DECL_LINK_TYPED( ImportTimerHdl, Timer*, void ); + DECL_LINK( ImportTimerHdl, Timer*, void ); private: ScDocShell* mpDocShell; diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index ee0ef36b8791..74fba3ff6de4 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -47,10 +47,10 @@ class DataStreamDlg : public ModalDialog VclPtr<VclFrame> m_pVclFrameLimit; VclPtr<VclFrame> m_pVclFrameMove; - DECL_LINK_TYPED(UpdateClickHdl, Button*, void); - DECL_LINK_TYPED(UpdateHdl, Edit&, void); - DECL_LINK_TYPED(UpdateComboBoxHdl, ComboBox&, void); - DECL_LINK_TYPED(BrowseHdl, Button*, void); + DECL_LINK(UpdateClickHdl, Button*, void); + DECL_LINK(UpdateHdl, Edit&, void); + DECL_LINK(UpdateComboBoxHdl, ComboBox&, void); + DECL_LINK(BrowseHdl, Button*, void); void UpdateEnable(); ScRange GetStartRange(); diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 34f831732c03..fcbc3cda24a9 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -91,12 +91,12 @@ private: void UpdateDBData( const OUString& rStrName ); void SetInfoStrings( const ScDBData* pDBData ); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); - DECL_LINK_TYPED( NameModifyHdl, Edit&, void ); - DECL_LINK_TYPED( AssModifyHdl, Edit&, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( OkBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( NameModifyHdl, Edit&, void ); + DECL_LINK( AssModifyHdl, Edit&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_DBNAMDLG_HXX diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index fa6667a84a11..f2122ead7846 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -43,7 +43,7 @@ private: static InsertDeleteFlags nPreviousChecks; void DisableChecks( bool bDelAllChecked ); - DECL_LINK_TYPED( DelAllHdl, Button*, void ); + DECL_LINK( DelAllHdl, Button*, void ); public: ScDeleteContentsDlg( vcl::Window* pParent, diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index af6deb00b2db..f54893ed4613 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -68,7 +68,7 @@ protected: public: virtual ~ScDocFunc() {} - DECL_LINK_TYPED( NotifyDrawUndo, SdrUndoAction*, void ); + DECL_LINK( NotifyDrawUndo, SdrUndoAction*, void ); // for grouping multiple operations into one with a new name void EnterListAction( sal_uInt16 nNameResId ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index e7503b062e09..31adcf66ea43 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -341,7 +341,7 @@ public: void LockDocument(); void UnlockDocument(); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); virtual SfxStyleSheetBasePool* GetStyleSheetPool() override; @@ -399,7 +399,7 @@ public: static OUString GetDifFilterName(); static bool HasAutomaticTableName( const OUString& rFilter ); - DECL_LINK_TYPED( RefreshDBDataHdl, Timer*, void ); + DECL_LINK( RefreshDBDataHdl, Timer*, void ); void BeforeXMLLoading(); void AfterXMLLoading(bool bRet); diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 68c134d6d1fa..7abcea8f7136 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -46,7 +46,7 @@ private: virtual bool ImplGetValue( double& rfValue ) const = 0; virtual void ImplSetValue( double fValue ) = 0; - DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); private: VclPtr<RadioButton> mpRbAuto; @@ -119,8 +119,8 @@ public: sal_Int32 GetDatePart() const; private: - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( CheckHdl, SvTreeListBox*, void ); private: VclPtr<RadioButton> mpRbAutoStart; diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 90c0f09d1403..0da1b1532f05 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -39,7 +39,7 @@ class ScDrawShell : public SfxShell ScViewData* pViewData; ::rtl::Reference<svx::sidebar::SelectionChangeHandler> mpSelectionChangeHandler; - DECL_LINK_TYPED( NameObjectHdl, AbstractSvxObjectNameDialog&, bool ); + DECL_LINK( NameObjectHdl, AbstractSvxObjectNameDialog&, bool ); void SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk ); diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index f5333d108264..bc29dc93e528 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -38,7 +38,7 @@ class ScDrawTextObjectBar : public SfxShell rtl::Reference<TransferableClipboardListener> mxClipEvtLstnr; bool bPastePossible; - DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); public: SFX_DECL_INTERFACE(SCID_DRAW_TEXT_SHELL) diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index a3e127dc35de..cea49c96b25e 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -65,11 +65,11 @@ private: void SetMyHeightLeRi(Size &aNewSize); void UseSplitterInitPos(); - DECL_LINK_TYPED( SetSelectionHdl, ListBox&, void ); - DECL_LINK_TYPED( SetSelectionClickHdl, Button*, void ); - DECL_LINK_TYPED( SelHdl, ListBox&, void ); - DECL_LINK_TYPED( SetSplitHdl, ScPrivatSplit&, void ); - DECL_LINK_TYPED( TimerHdl, Idle*, void ); + DECL_LINK( SetSelectionHdl, ListBox&, void ); + DECL_LINK( SetSelectionClickHdl, Button*, void ); + DECL_LINK( SelHdl, ListBox&, void ); + DECL_LINK( SetSplitHdl, ScPrivatSplit&, void ); + DECL_LINK( TimerHdl, Idle*, void ); protected: diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx index 1638ce4b2785..eaeed421ca27 100644 --- a/sc/source/ui/inc/editsh.hxx +++ b/sc/source/ui/inc/editsh.hxx @@ -46,7 +46,7 @@ private: const SvxURLField* GetURLField(); ScInputHandler* GetMyInputHdl(); - DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); public: SFX_DECL_INTERFACE(SCID_EDIT_SHELL) diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 0674b0fb45ed..1a913143c334 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -101,8 +101,8 @@ private: bool CheckIncrementVal(); bool CheckEndVal(); - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( DisableHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( DisableHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FILLDLG_HXX diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index c901bad73f05..05a80e8dcf63 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -148,15 +148,15 @@ private: ScQueryItem* GetOutputItem (); // Handler: - DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ValModifyHdl, Edit&, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( EndDlgHdl, Button*, void ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( MoreExpandedHdl, VclExpander&, void ); + DECL_LINK( LbSelectHdl, ListBox&, void ); + DECL_LINK( ValModifyHdl, Edit&, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( EndDlgHdl, Button*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( MoreExpandedHdl, VclExpander&, void ); // Hack: RefInput control - DECL_LINK_TYPED( TimeOutHdl, Timer*, void ); + DECL_LINK( TimeOutHdl, Timer*, void ); }; class ScSpecialFilterDlg : public ScAnyRefDlg @@ -216,12 +216,12 @@ private: const ScRange& rSource ); // Handler - DECL_LINK_TYPED( FilterAreaSelHdl, ListBox&, void ); - DECL_LINK_TYPED( FilterAreaModHdl, Edit&, void ); - DECL_LINK_TYPED( EndDlgHdl, Button*, void ); + DECL_LINK( FilterAreaSelHdl, ListBox&, void ); + DECL_LINK( FilterAreaModHdl, Edit&, void ); + DECL_LINK( EndDlgHdl, Button*, void ); // Hack: RefInput control - DECL_LINK_TYPED( TimeOutHdl, Idle*, void ); + DECL_LINK( TimeOutHdl, Idle*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FILTDLG_HXX diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 4b6a3cac0e32..bc1ef9b3ecbb 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -77,9 +77,9 @@ private: void Init(); // Handler: - DECL_LINK_TYPED( EdAreaModifyHdl, Edit&, void ); - DECL_LINK_TYPED( LbAreaSelHdl, ListBox&, void ); - DECL_LINK_TYPED( BtnCopyResultHdl, CheckBox&, void ); + DECL_LINK( EdAreaModifyHdl, Edit&, void ); + DECL_LINK( LbAreaSelHdl, ListBox&, void ); + DECL_LINK( BtnCopyResultHdl, CheckBox&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FOPTMGR_HXX diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index d54d0cc45e14..bbdfdb30250c 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -50,12 +50,12 @@ protected: VclPtr<Dialog> pDialog; Timer aScrollTimer; // for Autoscrolling - DECL_LINK_TYPED( ScrollHdl, Timer *, void ); + DECL_LINK( ScrollHdl, Timer *, void ); void ForceScroll(const Point& aPixPos); Timer aDragTimer; // for Drag&Drop - DECL_LINK_TYPED( DragTimerHdl, Timer *, void ); - DECL_LINK_TYPED( DragHdl, void *, void ); + DECL_LINK( DragTimerHdl, Timer *, void ); + DECL_LINK( DragHdl, void *, void ); bool bIsInDragMode; Point aMDPos; // Position of MouseButtonDown diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 6f3a3c94bc93..7272cc0b5803 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -192,8 +192,8 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou bool bAutoMarkVisible:1; bool bListValButton:1; - DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); - DECL_LINK_TYPED( PopupSpellingHdl, SpellCallbackInfo&, void ); + DECL_LINK( PopupModeEndHdl, FloatingWindow*, void ); + DECL_LINK( PopupSpellingHdl, SpellCallbackInfo&, void ); bool TestMouse( const MouseEvent& rMEvt, bool bAction ); diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 9a04ff9707e9..151b16ffe6ee 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -58,9 +58,9 @@ private: void Init(); - DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void ); - DECL_LINK_TYPED( HighlightHandle, Button*, void ); - DECL_LINK_TYPED( OKBtnHdl, Button*, void ); + DECL_LINK( RefHandle, SvxTPFilter*, void ); + DECL_LINK( HighlightHandle, Button*, void ); + DECL_LINK( OKBtnHdl, Button*, void ); protected: diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 7ea15d724a15..e11cfb096f06 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -134,7 +134,7 @@ private: void UpdateFormulaMode(); static void InvalidateAttribs(); void ImplCreateEditEngine(); - DECL_LINK_TYPED( DelayTimer, Timer*, void ); + DECL_LINK( DelayTimer, Timer*, void ); void GetColData(); void UseColData(); void NextAutoEntry( bool bBack ); @@ -156,9 +156,9 @@ private: void SkipClosingPar(); bool GetFuncName( OUString& aStart, OUString& aResult ); // fdo75264 void ShowArgumentsTip( OUString& rSelText ); - DECL_LINK_TYPED( ModifyHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( ShowHideTipVisibleParentListener, VclWindowEvent&, void ); - DECL_LINK_TYPED( ShowHideTipVisibleSecParentListener, VclWindowEvent&, void ); + DECL_LINK( ModifyHdl, LinkParamNone*, void ); + DECL_LINK( ShowHideTipVisibleParentListener, VclWindowEvent&, void ); + DECL_LINK( ShowHideTipVisibleSecParentListener, VclWindowEvent&, void ); public: ScInputHandler(const ScInputHandler&) = delete; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index c049b385f11b..63318f20931f 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -99,8 +99,8 @@ public: void DoScroll(); - DECL_LINK_TYPED(NotifyHdl, EENotify&, void); - DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void); + DECL_LINK(NotifyHdl, EENotify&, void); + DECL_LINK(ModifyHdl, LinkParamNone*, void); protected: virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; @@ -215,8 +215,8 @@ private: VclPtr<ScrollBar> maScrollbar; long mnVertOffset; - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( Impl_ScrollHdl, ScrollBar*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( Impl_ScrollHdl, ScrollBar*, void ); }; class ScInputWindow : public ToolBox // Parent toolbox diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 8b14a994891c..24897a7e775a 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -97,9 +97,9 @@ private: void TestModes(); // Handler - DECL_LINK_TYPED( InsAllHdl, Button*, void ); - DECL_LINK_TYPED( LinkBtnHdl, Button*, void ); - DECL_LINK_TYPED( ShortCutHdl, Button*, void ); + DECL_LINK( InsAllHdl, Button*, void ); + DECL_LINK( LinkBtnHdl, Button*, void ); + DECL_LINK( ShortCutHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_INSCODLG_HXX diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index cd5cd171e252..141a92a5a8cf 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -91,13 +91,13 @@ 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_TYPED( CountHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( DoEnterHdl, Button*, void ); - DECL_LINK_TYPED( BrowseTimeoutHdl, Timer *, void ); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( BrowseHdl_Impl, Button*, void ); + DECL_LINK( ChoiceHdl_Impl, Button*, void ); + DECL_LINK( SelectHdl_Impl, ListBox&, void ); + DECL_LINK( CountHdl_Impl, Edit&, void ); + DECL_LINK( DoEnterHdl, Button*, void ); + DECL_LINK( BrowseTimeoutHdl, Timer *, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_INSTBDLG_HXX diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index 7b5215411944..a67e2972a5b8 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -32,7 +32,7 @@ class ScSelEntryDlg : public ModalDialog private: VclPtr<ListBox> m_pLb; - DECL_LINK_TYPED( DblClkHdl, ListBox&, void ); + DECL_LINK( DblClkHdl, ListBox&, void ); public: ScSelEntryDlg(vcl::Window* pParent, const std::vector<OUString> &rEntryList); diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index f8781b656d42..f199e42c0621 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -51,11 +51,11 @@ private: SfxObjectShellRef aSourceRef; - DECL_LINK_TYPED(FileHdl, ComboBox&, void); - DECL_LINK_TYPED(BrowseHdl, Button*, void); - DECL_LINK_TYPED(RangeHdl, ListBox&, void); - DECL_LINK_TYPED(ReloadHdl, Button*, void); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK(FileHdl, ComboBox&, void); + DECL_LINK(BrowseHdl, Button*, void); + DECL_LINK(RangeHdl, ListBox&, void); + DECL_LINK(ReloadHdl, Button*, void); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); void UpdateSourceRanges(); void UpdateEnable(); diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index f5f9d5e4afae..f6815065d798 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -49,8 +49,8 @@ private: long nDefaultValue; long nCurrentValue; - DECL_LINK_TYPED(SetDefValHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(SetDefValHdl, Button*, void); + DECL_LINK(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 6d4f12bddbf6..0b77c8d89aa5 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -75,10 +75,10 @@ private: void Init (); void InitDocListBox (); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( SelHdl, ListBox&, void ); - DECL_LINK_TYPED( CheckBtnHdl, RadioButton&, void ); - DECL_LINK_TYPED( CheckNameHdl, Edit&, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( SelHdl, ListBox&, void ); + DECL_LINK( CheckBtnHdl, RadioButton&, void ); + DECL_LINK( 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 be8855caba25..3a036a91a2b3 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -64,10 +64,10 @@ private: bool IsNameValid(); bool IsFormulaValid(); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( NameModifyHdl, Edit&, void ); - DECL_LINK_TYPED( AssignGetFocusHdl, Control&, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( NameModifyHdl, Edit&, void ); + DECL_LINK( AssignGetFocusHdl, Control&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 20f779fdb7f4..7101a5b50a1d 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -99,15 +99,15 @@ private: void SelectionChanged(); // Handler: - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( RemoveBtnHdl, Button*, 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 ); - DECL_LINK_TYPED( ScopeChangedHdl, ListBox&, void ); + DECL_LINK( OkBtnHdl, Button*, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( EdModifyHdl, Edit&, void ); + DECL_LINK( EdModifyCheckBoxHdl, CheckBox&, void ); + DECL_LINK( AssignGetFocusHdl, Control&, void ); + DECL_LINK( SelectionChangedHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( ScopeChangedHdl, ListBox&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index c725ba381ed7..cb9ab35dbe2f 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -84,8 +84,8 @@ public: bool IsMultiSelection(); std::vector<ScRangeNameLine> GetSelectedEntries(); - DECL_LINK_TYPED( ScrollHdl, SvTreeListBox*, void); - DECL_LINK_TYPED( HeaderEndDragHdl, HeaderBar*, void); + DECL_LINK( ScrollHdl, SvTreeListBox*, void); + DECL_LINK( HeaderEndDragHdl, HeaderBar*, void); }; #endif diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 46d779dfe535..4ae4fa18d88a 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -36,7 +36,7 @@ class ScDocShell; class ScNamePasteDlg : public ModalDialog { - DECL_LINK_TYPED( ButtonHdl, Button *, void ); + DECL_LINK( ButtonHdl, Button *, void ); private: VclPtr<PushButton> m_pBtnPasteAll; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index f424c6d02792..0f276d089274 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -194,7 +194,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void ); + DECL_LINK( ToolBoxDropdownClickHdl, ToolBox*, void ); protected: virtual void Select() override; @@ -257,7 +257,7 @@ private: ScNavigatorControllerItem** ppBoundItems; - DECL_LINK_TYPED( TimeHdl, Idle*, void ); + DECL_LINK( TimeHdl, Idle*, void ); void DoResize(); diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index b6f8f8d70d00..2d83b8fe500e 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -49,7 +49,7 @@ private: SdrObject* pObject; bool bVisible; Point aGridOff; - DECL_LINK_TYPED( TimeHdl, Timer*, void ); + DECL_LINK( TimeHdl, Timer*, void ); public: ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window* pBottom, vcl::Window* pDiagonal, diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 809f44850e0e..a46978b3c19e 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -189,16 +189,16 @@ private: bool FindTimeout( sal_Int32& rTimeout ); void ShowError( bool bCondition, formula::RefEdit* pFocus ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( DelBtnHdl, Button*, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void); - DECL_LINK_TYPED( CursorUpHdl, ScCursorRefEdit&, void ); - DECL_LINK_TYPED( CursorDownHdl, ScCursorRefEdit&, void ); - DECL_LINK_TYPED( CondModifyHdl, Edit&, void ); - DECL_LINK_TYPED( TargetModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( DelBtnHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void); + DECL_LINK( CursorUpHdl, ScCursorRefEdit&, void ); + DECL_LINK( CursorDownHdl, ScCursorRefEdit&, void ); + DECL_LINK( CondModifyHdl, Edit&, void ); + DECL_LINK( TargetModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); }; class ScSolverProgressDialog : public ModelessDialog @@ -230,7 +230,7 @@ class ScSolverSuccessDialog : public ModalDialog VclPtr<PushButton> m_pBtnOk; VclPtr<PushButton> m_pBtnCancel; - DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK(ClickHdl, Button*, void); public: ScSolverSuccessDialog( vcl::Window* pParent, const OUString& rSolution ); diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index da55fc7a414b..c3fcdd64d8a1 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -90,9 +90,9 @@ private: sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler: - DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ValModifyHdl, Edit&, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); + DECL_LINK( LbSelectHdl, ListBox&, void ); + DECL_LINK( ValModifyHdl, Edit&, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index f39e6d32b053..ca5dbb461254 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -154,7 +154,7 @@ public: void CalcAll() { CalcPages(); } void SetInGetState(bool bSet) { bInGetState = bSet; } - DECL_STATIC_LINK_TYPED( ScPreview, InvalidateHdl, void*, void ); + DECL_STATIC_LINK( ScPreview, InvalidateHdl, void*, void ); static void StaticInvalidate(); FmFormView* GetDrawView() { return pDrawView; } diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 77a9589b5183..dab12bc523b1 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -55,8 +55,8 @@ class SC_DLLPUBLIC ScPreviewShell: public SfxViewShell bool GetPageSize( Size& aPageSize ); private: void Construct( vcl::Window* pParent ); - DECL_LINK_TYPED( ScrollHandler, ScrollBar*, void ); - DECL_LINK_TYPED( CloseHdl, SystemWindow&, void); + DECL_LINK( ScrollHandler, ScrollBar*, void ); + DECL_LINK( CloseHdl, SystemWindow&, void); void DoScroll( sal_uInt16 nMode ); void ExitPreview(); diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index e995585acc5f..fb1948491b0d 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -65,9 +65,9 @@ private: OUString m_aSelectLockedCells; OUString m_aSelectUnlockedCells; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( PasswordModifyHdl, Edit&, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( PasswordModifyHdl, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index f5b6c73fe6c0..70fe3b65a375 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -74,8 +74,8 @@ private: /** Searches for a listbox entry, starts search at specified position. */ sal_Int32 FindBaseItemPos( const OUString& rEntry, sal_Int32 nStartPos ) const; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DblClickHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( DblClickHdl, ListBox&, void ); private: VclPtr<ScDPFunctionListBox> mpLbFunc; @@ -111,9 +111,9 @@ public: private: void Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); - DECL_LINK_TYPED( DblClickHdl, ListBox&, void ); - DECL_LINK_TYPED( RadioClickHdl, Button*, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK( DblClickHdl, ListBox&, void ); + DECL_LINK( RadioClickHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); private: VclPtr<RadioButton> mpRbNone; @@ -151,9 +151,9 @@ private: /** Searches for a listbox entry, starts search at specified position. */ sal_Int32 FindListBoxEntry( const ListBox& rLBox, const OUString& rEntry, sal_Int32 nStartPos ) const; - DECL_LINK_TYPED( RadioClickHdl, Button*, void ); - DECL_LINK_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( RadioClickHdl, Button*, void ); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); private: VclPtr<ListBox> m_pLbSortBy; @@ -202,7 +202,7 @@ public: OUString GetDimensionName() const; private: - DECL_LINK_TYPED( DblClickHdl, ListBox&, void ); + DECL_LINK( DblClickHdl, ListBox&, void ); private: VclPtr<ListBox> mpLbDims; diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx index 35e350cfc686..d0c4a145215a 100644 --- a/sc/source/ui/inc/redcom.hxx +++ b/sc/source/ui/inc/redcom.hxx @@ -34,8 +34,8 @@ private: OUString aComment; AbstractSvxPostItDialog* pDlg; - DECL_LINK_TYPED( PrevHdl, AbstractSvxPostItDialog&, void ); - DECL_LINK_TYPED( NextHdl, AbstractSvxPostItDialog&, void ); + DECL_LINK( PrevHdl, AbstractSvxPostItDialog&, void ); + DECL_LINK( NextHdl, AbstractSvxPostItDialog&, void ); protected: diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 667b819ff7d3..bced3fbd507e 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -83,8 +83,8 @@ private: OUString maTextHashBad; OUString maTextHashGood; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( RetypeBtnHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( RetypeBtnHdl, Button*, void ); struct TableItem { @@ -127,10 +127,10 @@ private: VclPtr<RadioButton> m_pBtnRemovePassword; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( RadioBtnHdl, Button*, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( PasswordModifyHdl, Edit&, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( RadioBtnHdl, Button*, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( PasswordModifyHdl, Edit&, void ); ScPassHashProtectable* mpProtected; }; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 6e3673db711d..08bac4560f45 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -53,8 +53,8 @@ private: const OUString aDefScenarioName; bool bIsEdit; - DECL_LINK_TYPED( OkHdl, Button*, void); - DECL_LINK_TYPED( EnableHdl, Button*, void ); + DECL_LINK( OkHdl, Button*, void); + DECL_LINK( EnableHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_SCENDLG_HXX diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 14719ef13c0b..65848aa1ec7c 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -114,16 +114,16 @@ private: void UpdateVertical(); inline bool Seek( sal_uLong nPos ); // synced to and from mnStreamPos - DECL_LINK_TYPED( CharSetHdl, ListBox&, void ); - DECL_LINK_TYPED( FirstRowHdl, Edit&, void ); - DECL_LINK_TYPED( RbSepFixHdl, Button*, void ); - DECL_LINK_TYPED( SeparatorEditHdl, Edit&, void ); - DECL_LINK_TYPED( SeparatorClickHdl, Button*, void ); - DECL_LINK_TYPED( SeparatorComboBoxHdl, ComboBox&, void ); + DECL_LINK( CharSetHdl, ListBox&, void ); + DECL_LINK( FirstRowHdl, Edit&, void ); + DECL_LINK( RbSepFixHdl, Button*, void ); + DECL_LINK( SeparatorEditHdl, Edit&, void ); + DECL_LINK( SeparatorClickHdl, Button*, void ); + DECL_LINK( SeparatorComboBoxHdl, ComboBox&, void ); void SeparatorHdl(Control*); - DECL_LINK_TYPED( LbColTypeHdl, ListBox&, void ); - DECL_LINK_TYPED( UpdateTextHdl, ScCsvTableBox&, void ); - DECL_LINK_TYPED( ColTypeHdl, ScCsvTableBox&, void ); + DECL_LINK( LbColTypeHdl, ListBox&, void ); + DECL_LINK( UpdateTextHdl, ScCsvTableBox&, void ); + DECL_LINK( ColTypeHdl, ScCsvTableBox&, void ); }; inline bool ScImportAsciiDlg::Seek(sal_uLong nPos) diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 15feb9ca9826..1c4e4f4f1276 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -62,13 +62,13 @@ private: void Init (); void UpdateChecks (); - DECL_LINK_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED( AddHdl, Button*, void ); - DECL_LINK_TYPED( RemoveHdl, Button*, void ); - DECL_LINK_TYPED( SelFmtHdl, ListBox&, void ); - DECL_LINK_TYPED( CloseHdl, Button *, void ); - DECL_LINK_TYPED( DblClkHdl, ListBox&, void ); - DECL_LINK_TYPED( RenameHdl, Button*, void ); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK( AddHdl, Button*, void ); + DECL_LINK( RemoveHdl, Button*, void ); + DECL_LINK( SelFmtHdl, ListBox&, void ); + DECL_LINK( CloseHdl, Button *, void ); + DECL_LINK( DblClkHdl, ListBox&, void ); + DECL_LINK( RenameHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 552dea78369b..91a59287444f 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -66,8 +66,8 @@ private: private: sal_uInt16 GetCodeFromCombo( const ComboBox& rEd ) const; - DECL_LINK_TYPED( FixedWidthHdl, Button*, void ); - DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void ); + DECL_LINK( FixedWidthHdl, Button*, void ); + DECL_LINK( DoubleClickHdl, ListBox&, void ); }; #endif diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 5f027fb5276b..12a93772fdc6 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -86,7 +86,7 @@ private: sal_uInt16 nWhich; - DECL_LINK_TYPED( ObjectSelectHdl, ScEditWindow&, void ); + DECL_LINK( ObjectSelectHdl, ScEditWindow&, void ); private: void InitPreDefinedList(); @@ -97,9 +97,9 @@ private: bool IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj); static bool IsDateEntry(EditTextObject* pTextObj); static bool IsExtFileNameEntry(EditTextObject* pTextObj); - DECL_LINK_TYPED( ListHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( MenuHdl, ScExtIButton&, void ); + DECL_LINK( ListHdl_Impl, ListBox&, void); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( MenuHdl, ScExtIButton&, void ); }; class ScRightHeaderEditPage : public ScHFEditPage diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index a4b3fdf4593d..bdc109e0f2e6 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -26,7 +26,7 @@ class SearchResultsDlg : public ModelessDialog SfxBindings* mpBindings; ScDocument* mpDoc; - DECL_LINK_TYPED( ListSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ListSelectHdl, SvTreeListBox*, void ); public: SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 nId ); virtual ~SearchResultsDlg() override; diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index fdbb73abf3ec..17ea38156bda 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -44,7 +44,7 @@ private: ScViewData* mpViewData; ScDocShell* mpDocShell; - DECL_LINK_TYPED( ToggleHandle, CheckBox&, void ); + DECL_LINK( ToggleHandle, CheckBox&, void ); public: SC_DLLPUBLIC ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewData ); diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index b81b793992ff..60823c4c4537 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -31,7 +31,7 @@ private: VclPtr<VclFrame> m_pFrame; VclPtr<ListBox> m_pLb; - DECL_LINK_TYPED( DblClkHdl, ListBox&, void ); + DECL_LINK( DblClkHdl, ListBox&, void ); public: ScShowTabDlg( vcl::Window* pParent ); diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 2c0bd54cff8d..57548099bca6 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -56,8 +56,8 @@ private: void Init(); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( OkBtnHdl, Button*, void ); protected: diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index e8c3f7388b54..ac0102a63a92 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -45,10 +45,10 @@ class ScSolverOptionsDialog : public ModalDialog OUString maEngine; css::uno::Sequence<css::beans::PropertyValue> maProperties; - DECL_LINK_TYPED( EngineSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( SettingsSelHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SettingsDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ButtonHdl, Button*, void ); + DECL_LINK( EngineSelectHdl, ListBox&, void ); + DECL_LINK( SettingsSelHdl, SvTreeListBox*, void ); + DECL_LINK( SettingsDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( ButtonHdl, Button*, void ); void ReadFromComponent(); void FillListBox(); diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 67116e575a90..3879d66a813e 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -80,9 +80,9 @@ private: bool CheckTargetValue( const OUString& rStrVal ); void RaiseError( ScSolverErr eError ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_SOLVRDLG_HXX diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx index 69175a9b970a..85b24b5de216 100644 --- a/sc/source/ui/inc/sortdlg.hxx +++ b/sc/source/ui/inc/sortdlg.hxx @@ -47,7 +47,7 @@ public: ScSortWarningDlg( vcl::Window* pParent, const OUString& rExtendText,const OUString& rCurrentText ); virtual ~ScSortWarningDlg() override; virtual void dispose() override; - DECL_LINK_TYPED( BtnHdl, Button*, void ); + DECL_LINK( BtnHdl, Button*, void ); private: VclPtr<FixedText> aFtText; VclPtr<PushButton> aBtnExtSort; diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index 8ed729b2d2b6..48b93e28dafd 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -67,7 +67,7 @@ private: VclScrolledWindow& m_rScrolledWindow; ScrollBar& m_rVertScroll; - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); + DECL_LINK(ScrollHdl, ScrollBar*, void); void checkAutoVScroll(); diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 08b85bd032bc..6077f9c6c6f9 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -32,7 +32,7 @@ public: virtual void dispose() override; private: VclPtr<PushButton> m_pBtnRemove; - DECL_LINK_TYPED( RemoveHdl, Button *, void ); + DECL_LINK( RemoveHdl, Button *, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_SUBTDLG_HXX diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 0f3373a2a652..e0a5166632ed 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -62,8 +62,8 @@ private: void FillColorValueSets_Impl(); - DECL_LINK_TYPED(TabBgColorDblClickHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(TabBgColorOKHdl_Impl, Button*, void); + DECL_LINK(TabBgColorDblClickHdl_Impl, ValueSet*, void); + DECL_LINK(TabBgColorOKHdl_Impl, Button*, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TABBGCOLORDLG_HXX diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index c6dfd23e32a6..5434c7b61259 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -42,7 +42,7 @@ private: sal_uInt16 GetMaxId() const; SCTAB GetPrivatDropPos(const Point& rPos ); - DECL_LINK_TYPED(ShowPageList, const CommandEvent&, void); + DECL_LINK(ShowPageList, const CommandEvent&, void); protected: virtual void Select() override; diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 1e31559687b8..163b9d3f8a79 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -87,9 +87,9 @@ private: void Init(); void RaiseError( ScTabOpErr eError ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TABOPDLG_HXX diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index cc93e5544e09..db34edaf3636 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -59,7 +59,7 @@ private: bool bHidePrint; // Handler: - DECL_LINK_TYPED( ButtonClickHdl, Button*, void ); + DECL_LINK( ButtonClickHdl, Button*, void ); void UpdateButtons(); }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 4cd3d79fe19d..58cebc8763ba 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -167,14 +167,14 @@ private: void DoAddWin( ScGridWindow* pWin ); void InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ); - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED(EndScrollHdl, ScrollBar*, void ); + DECL_LINK(ScrollHdl, ScrollBar*, void ); + DECL_LINK(EndScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED(SplitHdl, Splitter*, void); + DECL_LINK(SplitHdl, Splitter*, void); void DoHSplit(long nSplitPos); void DoVSplit(long nSplitPos); - DECL_LINK_TYPED( TimerHdl, Timer*, void ); + DECL_LINK( TimerHdl, Timer*, void ); void UpdateVarZoom(); @@ -240,7 +240,7 @@ public: void RemoveHintWindow(); void TestHintWindow(); - DECL_LINK_TYPED( TabBarResize, ::TabBar*, void ); + DECL_LINK( TabBarResize, ::TabBar*, void ); /** Sets an absolute tab bar width (in pixels). */ void SetTabBarWidth( long nNewWidth ); /** Sets a relative tab bar width. diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 5fec291467e2..392a133a4256 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -179,11 +179,11 @@ private: void DoReadUserData( const OUString& rData ); void DoReadUserDataSequence( const css::uno::Sequence< css::beans::PropertyValue >& rSettings ); - DECL_LINK_TYPED( SimpleRefClose, const OUString*, void ); - DECL_LINK_TYPED( SimpleRefDone, const OUString&, void ); - DECL_LINK_TYPED( SimpleRefAborted, const OUString&, void ); - DECL_LINK_TYPED( SimpleRefChange, const OUString&, void ); - DECL_LINK_TYPED( FormControlActivated, LinkParamNone*, void ); + DECL_LINK( SimpleRefClose, const OUString*, void ); + DECL_LINK( SimpleRefDone, const OUString&, void ); + DECL_LINK( SimpleRefAborted, const OUString&, void ); + DECL_LINK( SimpleRefChange, const OUString&, void ); + DECL_LINK( FormControlActivated, LinkParamNone*, void ); protected: virtual void Activate(bool bMDI) override; diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 35f7d0ddc25d..934df868eb5e 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -50,9 +50,9 @@ private: VclPtr<CheckBox> m_pBtnConvertDate; - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); - DECL_LINK_TYPED( RadioHdl, Button*, void ); + DECL_LINK( RadioHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 213ac740f450..f0cc0f098e50 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -77,8 +77,8 @@ private: void Init(); // Handler: - DECL_LINK_TYPED( RadioClickHdl, Button*, void ); - DECL_LINK_TYPED( CheckClickHdl, Button*, void ); + DECL_LINK( RadioClickHdl, Button*, void ); + DECL_LINK( CheckClickHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 4533a85db9e6..287d13740abf 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -35,9 +35,9 @@ private: void CheckPrefix(Edit* pEdit); void OnFocusPrefixInput(Edit* pEdit); - DECL_LINK_TYPED( NumModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( PrefixModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( PrefixEditOnFocusHdl, Control&, void ); + DECL_LINK( NumModifiedHdl, Edit&, void ); + DECL_LINK( PrefixModifiedHdl, Edit&, void ); + DECL_LINK( PrefixEditOnFocusHdl, Control&, void ); private: VclPtr<NumericField> m_pEdNSheets; diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 6eb4ff43eca4..18542e28b5de 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -53,9 +53,9 @@ private: bool IsValidSeparator(const OUString& rSep) const; bool IsValidSeparatorSet() const; - DECL_LINK_TYPED( ButtonHdl, Button*, void ); - DECL_LINK_TYPED( SepModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SepEditOnFocusHdl, Control&, void ); + DECL_LINK( ButtonHdl, Button*, void ); + DECL_LINK( SepModifyHdl, Edit&, void ); + DECL_LINK( SepEditOnFocusHdl, Control&, void ); private: VclPtr<ListBox> mpLbFormulaSyntax; diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 36f9432757b6..06544a0afeda 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -53,9 +53,9 @@ private: sal_uInt16 nPageUsage; VclPtr<ScStyleDlg> pStyleDlg; - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( HFEditHdl, void*, void ); - DECL_LINK_TYPED( TurnOnHdl, Button*, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( HFEditHdl, void*, void ); + DECL_LINK( TurnOnHdl, Button*, void ); }; class ScHeaderPage : public ScHFPage diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 1a14b048544a..5ce0f55708b0 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -109,7 +109,7 @@ private: sal_uInt16 nSelected; OString aSelectedIdent; - DECL_DLLPRIVATE_LINK_TYPED( TimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( TimerHdl, Idle*, void ); protected: diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 50f20f396276..80be8041123e 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -92,7 +92,7 @@ private: void SetLastSortKey( sal_uInt16 nItem ); // Handler ------------------------ - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); }; // Sort Options @@ -162,11 +162,11 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK_TYPED( EnableHdl, Button*, void ); - DECL_LINK_TYPED( SelOutPosHdl, ListBox&, void ); + DECL_LINK( EnableHdl, Button*, void ); + DECL_LINK( SelOutPosHdl, ListBox&, void ); void EdOutPosModHdl ( Edit* pEd ); - DECL_LINK_TYPED( SortDirHdl, Button *, void ); - DECL_LINK_TYPED( FillAlgorHdl, ListBox&, void ); + DECL_LINK( SortDirHdl, Button *, void ); + DECL_LINK( FillAlgorHdl, ListBox&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPSORT_HXX diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index efc08298d326..08d2769b8d7c 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -70,9 +70,9 @@ private: sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler ------------------------ - DECL_LINK_TYPED( SelectListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectTreeListBoxHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); + DECL_LINK( SelectListBoxHdl, ListBox&, void ); + DECL_LINK( SelectTreeListBoxHdl, SvTreeListBox*, void ); + DECL_LINK( CheckHdl, SvTreeListBox*, void ); void SelectHdl(void *); }; @@ -160,7 +160,7 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK_TYPED( CheckHdl, Button*, void ); + DECL_LINK( CheckHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPSUBT_HXX diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 91cbad99f728..f3d01eef310d 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -73,9 +73,9 @@ private: private: // Handler: - DECL_LINK_TYPED(PageDirHdl, Button*, void); - DECL_LINK_TYPED( PageNoHdl, Button*, void ); - DECL_LINK_TYPED(ScaleHdl, ListBox&, void); + DECL_LINK(PageDirHdl, Button*, void); + DECL_LINK( PageNoHdl, Button*, void ); + DECL_LINK(ScaleHdl, ListBox&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPTABLE_HXX diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 3bebe5aac5d8..8e5af6e49b47 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -94,9 +94,9 @@ private: const ScRefAddress& rEndPos ); // Handler: - DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( BtnClickHdl, Button*, void ); - DECL_LINK_TYPED( EdEntriesModHdl, Edit&, void); + DECL_LINK( LbSelectHdl, ListBox&, void ); + DECL_LINK( BtnClickHdl, Button*, void ); + DECL_LINK( EdEntriesModHdl, Edit&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPUSRLST_HXX diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index a8a73b8e99f2..b6cf36b718b0 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -61,9 +61,9 @@ class ScTpContentOptions : public SfxTabPage ScViewOptions* pLocalOptions; void InitGridOpt(); - DECL_LINK_TYPED( GridHdl, ListBox&, void ); - DECL_LINK_TYPED( SelLbObjHdl, ListBox&, void ); - DECL_LINK_TYPED( CBHdl, Button*, void ); + DECL_LINK( GridHdl, ListBox&, void ); + DECL_LINK( SelLbObjHdl, ListBox&, void ); + DECL_LINK( CBHdl, Button*, void ); ScTpContentOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); @@ -106,8 +106,8 @@ class ScTpLayoutOptions : public SfxTabPage SvxStringArray aUnitArr; - DECL_LINK_TYPED(MetricHdl, ListBox&, void ); - DECL_LINK_TYPED( AlignHdl, Button*, void ); + DECL_LINK(MetricHdl, ListBox&, void ); + DECL_LINK( AlignHdl, Button*, void ); ScDocument *pDoc; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 802bc30d4485..58df264167c6 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -92,8 +92,8 @@ private: void SetFirstFormula( const OUString& rFmlaStr ); void SetSecondFormula( const OUString& rFmlaStr ); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK_TYPED(CheckHdl, Button*, void); + DECL_LINK(SelectHdl, ListBox&, void); + DECL_LINK(CheckHdl, Button*, void); VclPtr<ListBox> m_pLbAllow; VclPtr<CheckBox> m_pCbAllow; /// Allow blank cells. @@ -116,8 +116,8 @@ private: OUString maStrList; sal_Unicode mcFmlaSep; /// List separator in formulas. - DECL_LINK_TYPED( EditSetFocusHdl, Control&, void ); - DECL_LINK_TYPED( KillFocusHdl, Control&, void ); + DECL_LINK( EditSetFocusHdl, Control&, void ); + DECL_LINK( KillFocusHdl, Control&, void ); void OnClick( Button *pBtn ); VclPtr<formula::RefEdit> m_pRefEdit; public: @@ -282,8 +282,8 @@ private: void Init(); // Handler ------------------------ - DECL_LINK_TYPED(SelectActionHdl, ListBox&, void); - DECL_LINK_TYPED(ClickSearchHdl, Button*, void); + DECL_LINK(SelectActionHdl, ListBox&, void); + DECL_LINK(ClickSearchHdl, Button*, void); public: ScTPValidationError( vcl::Window* pParent, const SfxItemSet& rArgSet ); diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 1e717cc98668..e007a4b6f055 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -225,7 +225,7 @@ private: bool bPagebreak:1; // Page break preview mode bool bSelCtrlMouseClick:1; // special selection handling for ctrl-mouse-click - DECL_DLLPRIVATE_LINK_TYPED( EditEngineHdl, EditStatus&, void ); + DECL_DLLPRIVATE_LINK( EditEngineHdl, EditStatus&, void ); SAL_DLLPRIVATE void CalcPPT(); SAL_DLLPRIVATE void CreateTabData( SCTAB nNewTab ); diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 6c4f64c5dce5..d5e415aee4da 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -94,10 +94,10 @@ private: void CancelPressed(); void RefEditModified(); - DECL_LINK_TYPED(GetFocusHdl, Control&, void); - DECL_LINK_TYPED(BtnPressedHdl, Button*, void); - DECL_LINK_TYPED(TreeItemSelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(RefModifiedHdl, Edit&, void); + DECL_LINK(GetFocusHdl, Control&, void); + DECL_LINK(BtnPressedHdl, Button*, void); + DECL_LINK(TreeItemSelectHdl, SvTreeListBox*, void); + DECL_LINK(RefModifiedHdl, Edit&, void); }; #endif diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 203314a06ba2..c07e7c35e3f4 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -838,7 +838,7 @@ void ScAcceptChgDlg::UpdateView() pTheView->Select(pEntry); } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RefHandle, SvxTPFilter*, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, RefHandle, SvxTPFilter*, void) { sal_uInt16 nId =ScSimpleRefDlgWrapper::GetChildWindowId(); @@ -864,7 +864,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RefHandle, SvxTPFilter*, void) } } -IMPL_LINK_TYPED( ScAcceptChgDlg, RefInfoHandle, const OUString*, pResult, void) +IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, const OUString*, pResult, void) { sal_uInt16 nId; @@ -897,7 +897,7 @@ IMPL_LINK_TYPED( ScAcceptChgDlg, RefInfoHandle, const OUString*, pResult, void) } } -IMPL_LINK_TYPED( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void ) +IMPL_LINK( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void ) { if(pRef!=nullptr) { @@ -908,7 +908,7 @@ IMPL_LINK_TYPED( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void ) } } -IMPL_LINK_TYPED( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef, void ) +IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef, void ) { SetPointer(Pointer(PointerStyle::Wait)); @@ -945,7 +945,7 @@ IMPL_LINK_TYPED( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef, void ) bIgnoreMsg=false; } -IMPL_LINK_TYPED( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef, void ) +IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef, void ) { SetPointer(Pointer(PointerStyle::Wait)); @@ -1022,7 +1022,7 @@ void ScAcceptChgDlg::AcceptFiltered() } } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RejectAllHandle, SvxTPView*, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, RejectAllHandle, SvxTPView*, void) { SetPointer(Pointer(PointerStyle::Wait)); bIgnoreMsg=true; @@ -1049,7 +1049,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RejectAllHandle, SvxTPView*, void) bIgnoreMsg=false; } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, void) { SetPointer(Pointer(PointerStyle::Wait)); @@ -1073,7 +1073,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, void) SetPointer(Pointer(PointerStyle::Arrow)); } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, SelectHandle, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, SelectHandle, SvTreeListBox*, void) { if(!bNoSelection) aSelectionIdle.Start(); @@ -1310,7 +1310,7 @@ bool ScAcceptChgDlg::Expand( return bTheTestFlag; } -IMPL_LINK_TYPED( ScAcceptChgDlg, ExpandingHandle, SvTreeListBox*, pTable, bool ) +IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvTreeListBox*, pTable, bool ) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); SetPointer(Pointer(PointerStyle::Wait)); @@ -1555,7 +1555,7 @@ void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, sal_uLong nStartActi } -IMPL_LINK_TYPED( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void) +IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void) { ScChangeTrackMsgQueue::iterator iter; ScChangeTrackMsgQueue& aMsgQueue= rChgTrack.GetMsgQueue(); @@ -1593,14 +1593,14 @@ IMPL_LINK_TYPED( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void aMsgQueue.clear(); } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, ReOpenTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, ReOpenTimerHdl, Idle *, void) { ScSimpleRefDlgWrapper::SetAutoReOpen(true); m_pAcceptChgCtr->ShowFilterPage(); RefHandle(nullptr); } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, UpdateSelectionHdl, Idle *, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl, Idle *, void) { ScTabView* pTabView = pViewData->GetView(); @@ -1648,7 +1648,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, UpdateSelectionHdl, Idle *, void) pTPView->EnableReject( bRejectFlag && bEnable ); } -IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, CommandHdl, SvSimpleTable*, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl, SvSimpleTable*, void) { const CommandEvent aCEvt(pTheView->GetCommandEvent()); @@ -1822,7 +1822,7 @@ void ScAcceptChgDlg::InitFilter() #define CALC_DATE 3 #define CALC_POS 1 -IMPL_LINK_TYPED( ScAcceptChgDlg, ColCompareHdl, const SvSortData*, pSortData, sal_Int32 ) +IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, const SvSortData*, pSortData, sal_Int32 ) { sal_Int32 nCompare = 0; SCCOL nSortCol= static_cast<SCCOL>(pTheView->GetSortedCol()); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 4ed52bdfa44b..532cf9cc2fc3 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -338,7 +338,7 @@ void ScFormulaReferenceHelper::Init() } } -IMPL_LINK_TYPED( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator&, rSelAccel, void ) +IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator&, rSelAccel, void ) { switch ( rSelAccel.GetCurKeyCode().GetCode() ) { @@ -938,7 +938,7 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* m_aHelper.ToggleCollapsed( pEdit, pButton ); } -IMPL_LINK_NOARG_TYPED(ScRefHandler, UpdateFocusHdl, Idle *, void) +IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl, Idle *, void) { if (pActiveWin) { diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 2d4e8cfd5438..82172383c262 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -538,7 +538,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle ) } } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, SelectHandle, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScConflictsDlg, SelectHandle, SvTreeListBox*, void) { if ( mbInSelectHdl || mbInDeselectHdl ) { @@ -551,7 +551,7 @@ IMPL_LINK_NOARG_TYPED(ScConflictsDlg, SelectHandle, SvTreeListBox*, void) mbInSelectHdl = false; } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, DeselectHandle, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScConflictsDlg, DeselectHandle, SvTreeListBox*, void) { if ( mbInDeselectHdl || mbInSelectHdl ) { @@ -563,7 +563,7 @@ IMPL_LINK_NOARG_TYPED(ScConflictsDlg, DeselectHandle, SvTreeListBox*, void) mbInDeselectHdl = false; } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, UpdateSelectionHdl, Idle *, void) +IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl, Idle *, void) { if ( !mpViewData || !mpOwnDoc ) { @@ -650,22 +650,22 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepMineHandle, Button*, void) +IMPL_LINK_NOARG(ScConflictsDlg, KeepMineHandle, Button*, void) { KeepHandler( true ); } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepOtherHandle, Button*, void) +IMPL_LINK_NOARG(ScConflictsDlg, KeepOtherHandle, Button*, void) { KeepHandler( false ); } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepAllMineHandle, Button*, void) +IMPL_LINK_NOARG(ScConflictsDlg, KeepAllMineHandle, Button*, void) { KeepAllHandler( true ); } -IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepAllOthersHandle, Button*, void) +IMPL_LINK_NOARG(ScConflictsDlg, KeepAllOthersHandle, Button*, void) { KeepAllHandler( false ); } diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index deff2906e5a7..fb4dff623ec9 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -56,7 +56,7 @@ void ScColOrRowDlg::dispose() } -IMPL_LINK_NOARG_TYPED(ScColOrRowDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(ScColOrRowDlg, OkHdl, Button*, void) { EndDialog( m_pBtnCols->IsChecked() ? SCRET_COLS : SCRET_ROWS ); } diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 10d0f230cd84..d8c3beed7662 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -499,7 +499,7 @@ bool ScColRowNameRangesDlg::IsRefInputMode() const // handler called when OK is clicked, calls the add button handler before // passing the range lists to the document -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, OkBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl, Button*, void) { AddBtnHdl( nullptr ); @@ -515,13 +515,13 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, OkBtnHdl, Button*, void) Close(); } -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, CancelBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, CancelBtnHdl, Button*, void) { Close(); } // handler called when add button clicked: set ranges and add to listbox -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, AddBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl, Button*, void) { OUString aNewArea( pEdAssign->GetText() ); OUString aNewData( pEdAssign2->GetText() ); @@ -575,7 +575,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, AddBtnHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) { OUString aRangeStr = pLbRange->GetSelectEntry(); sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos(); @@ -635,7 +635,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) } // handler called when a row in the listbox is selected, updates form input fields -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void) { sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos(); const sal_Int32 nCnt = pLbRange->GetEntryCount(); @@ -703,7 +703,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void) } // handler called when the label range has changed -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range1DataModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl, Edit&, void) { OUString aNewArea( pEdAssign->GetText() ); bool bValid = false; @@ -736,7 +736,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range1DataModifyHdl, Edit&, void) } // handler called when the data range has changed -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range2DataModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl, Edit&, void) { OUString aNewData( pEdAssign2->GetText() ); if ( !aNewData.isEmpty() ) @@ -757,7 +757,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, Range2DataModifyHdl, Edit&, void) } // handler for the radio button for columns, adjust ranges -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, ColClickHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl, Button*, void) { if ( !pBtnColHead->GetSavedValue() ) { @@ -777,7 +777,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, ColClickHdl, Button*, void) } // handler for the radio button for columns, adjust range -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RowClickHdl, Button*, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl, Button*, void) { if ( !pBtnRowHead->GetSavedValue() ) { @@ -796,7 +796,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RowClickHdl, Button*, void) } } -IMPL_LINK_TYPED( ScColRowNameRangesDlg, GetFocusHdl, Control&, rCtrl, void ) +IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control&, rCtrl, void ) { if( (&rCtrl == static_cast<Control*>(pEdAssign)) || (&rCtrl == static_cast<Control*>(pRbAssign)) ) pEdActive = pEdAssign; @@ -809,7 +809,7 @@ IMPL_LINK_TYPED( ScColRowNameRangesDlg, GetFocusHdl, Control&, rCtrl, void ) pEdActive->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, LoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, LoseFocusHdl, Control&, void) { bDlgLostFocus = !IsActive(); } diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index f1d8f636a18f..60adc7355b6c 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -257,13 +257,13 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/) m_pSlider->SetThumbPos(nCurrentRow-nStartRow-1); } -IMPL_LINK_TYPED( ScDataFormDlg, Impl_DataModifyHdl, Edit&, rEdit, void) +IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit&, rEdit, void) { if ( rEdit.IsModified() ) m_pBtnRestore->Enable(); } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NewHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl, Button*, void) { ScViewData& rViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -296,7 +296,7 @@ IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NewHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_PrevHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_PrevHdl, Button*, void) { if (pDoc) { @@ -308,7 +308,7 @@ IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_PrevHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NextHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_NextHdl, Button*, void) { if (pDoc) { @@ -320,7 +320,7 @@ IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NextHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_RestoreHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_RestoreHdl, Button*, void) { if (pDoc) { @@ -328,7 +328,7 @@ IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_RestoreHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_DeleteHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_DeleteHdl, Button*, void) { ScViewData& rViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -347,12 +347,12 @@ IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_DeleteHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_CloseHdl, Button*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_CloseHdl, Button*, void) { EndDialog( ); } -IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_ScrollHdl, ScrollBar*, void) { long nOffset = m_pSlider->GetThumbPos(); nCurrentRow = nStartRow + nOffset + 1; diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index 432ae7ede665..b746d6051845 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -79,7 +79,7 @@ void DataStreamDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(DataStreamDlg, BrowseHdl, Button*, void) +IMPL_LINK_NOARG(DataStreamDlg, BrowseHdl, Button*, void) { sfx2::FileDialogHelper aFileDialog(0); if ( aFileDialog.Execute() != ERRCODE_NONE ) @@ -89,15 +89,15 @@ IMPL_LINK_NOARG_TYPED(DataStreamDlg, BrowseHdl, Button*, void) UpdateEnable(); } -IMPL_LINK_NOARG_TYPED(DataStreamDlg, UpdateClickHdl, Button*, void) +IMPL_LINK_NOARG(DataStreamDlg, UpdateClickHdl, Button*, void) { UpdateEnable(); } -IMPL_LINK_NOARG_TYPED(DataStreamDlg, UpdateComboBoxHdl, ComboBox&, void) +IMPL_LINK_NOARG(DataStreamDlg, UpdateComboBoxHdl, ComboBox&, void) { UpdateEnable(); } -IMPL_LINK_NOARG_TYPED(DataStreamDlg, UpdateHdl, Edit&, void) +IMPL_LINK_NOARG(DataStreamDlg, UpdateHdl, Edit&, void) { UpdateEnable(); } diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index c61a7a233d83..261041b34f6a 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -150,7 +150,7 @@ void ScDeleteContentsDlg::DisableObjects() aBtnDelObjects->Disable(); } -IMPL_LINK_NOARG_TYPED(ScDeleteContentsDlg, DelAllHdl, Button*, void) +IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl, Button*, void) { DisableChecks( aBtnDelAll->IsChecked() ); } diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index e52eaf26547c..838905b870d4 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -251,7 +251,7 @@ bool ScFillSeriesDlg::CheckEndVal() // Handler: -IMPL_LINK_TYPED( ScFillSeriesDlg, DisableHdl, Button *, pBtn, void ) +IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn, void ) { if ( pBtn == m_pBtnDate ) { @@ -286,7 +286,7 @@ IMPL_LINK_TYPED( ScFillSeriesDlg, DisableHdl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScFillSeriesDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl, Button*, void) { if ( m_pBtnLeft->IsChecked() ) theFillDir = FILL_TO_LEFT; else if ( m_pBtnRight->IsChecked() ) theFillDir = FILL_TO_RIGHT; diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 7be94ab129fb..028d49460592 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -174,7 +174,7 @@ bool ScHighlightChgDlg::IsRefInputMode() const return m_pEdAssign->IsVisible(); } -IMPL_LINK_TYPED( ScHighlightChgDlg, HighlightHandle, Button*, pCb, void ) +IMPL_LINK( ScHighlightChgDlg, HighlightHandle, Button*, pCb, void ) { if(pCb!=nullptr) { @@ -193,7 +193,7 @@ IMPL_LINK_TYPED( ScHighlightChgDlg, HighlightHandle, Button*, pCb, void ) } } -IMPL_LINK_TYPED( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef, void ) +IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef, void ) { if(pRef!=nullptr) { @@ -206,7 +206,7 @@ IMPL_LINK_TYPED( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef, void ) } } -IMPL_LINK_TYPED( ScHighlightChgDlg, OKBtnHdl, Button*, pOKBtn, void ) +IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, Button*, pOKBtn, void ) { if (pOKBtn == m_pOkButton) { diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 7e8d2aad945f..4e89f7eda9ff 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -303,7 +303,7 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) } } -IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void ) +IMPL_LINK( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void ) { if ( pBtn == mpBtnShortCutPasteValuesOnly ) { @@ -332,12 +332,12 @@ IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void ) } -IMPL_LINK_NOARG_TYPED(ScInsertContentsDlg, InsAllHdl, Button*, void) +IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl, Button*, void) { DisableChecks( mpBtnInsAll->IsChecked() ); } -IMPL_LINK_NOARG_TYPED(ScInsertContentsDlg, LinkBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl, Button*, void) { TestModes(); } diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 4594b3fe2adc..5d569b0ffbd8 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -240,7 +240,7 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) // Handler: -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, CountHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl, Edit&, void) { nTableCount = static_cast<SCTAB>(m_pNfCount->GetValue()); if ( nTableCount==1) @@ -261,7 +261,7 @@ IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, CountHdl_Impl, Edit&, void) DoEnable_Impl(); } -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, ChoiceHdl_Impl, Button*, void) +IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl, Button*, void) { if ( m_pBtnNew->IsChecked() ) SetNewTable_Impl(); @@ -271,7 +271,7 @@ IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, ChoiceHdl_Impl, Button*, void) DoEnable_Impl(); } -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl, Button*, void) { delete pDocInserter; pDocInserter = new ::sfx2::DocumentInserter( @@ -279,7 +279,7 @@ IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseHdl_Impl, Button*, void) pDocInserter->StartExecuteModal( LINK( this, ScInsertTableDlg, DialogClosedHdl ) ); } -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, SelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl, ListBox&, void) { DoEnable_Impl(); } @@ -292,7 +292,7 @@ void ScInsertTableDlg::DoEnable_Impl() m_pBtnOk->Disable(); } -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, DoEnterHdl, Button*, void) +IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl, Button*, void) { if(nTableCount > 1 || ScDocument::ValidTabName(m_pEdName->GetText())) { @@ -305,13 +305,13 @@ IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, DoEnterHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseTimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(ScInsertTableDlg, BrowseTimeoutHdl, Timer *, void) { bMustClose = true; BrowseHdl_Impl(m_pBtnBrowse); } -IMPL_LINK_TYPED( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { if ( ERRCODE_NONE == _pFileDlg->GetError() ) { diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 4ada1dca1adc..0720616b7f33 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -58,7 +58,7 @@ OUString ScSelEntryDlg::GetSelectEntry() const return m_pLb->GetSelectEntry(); } -IMPL_LINK_NOARG_TYPED(ScSelEntryDlg, DblClkHdl, ListBox&, void) +IMPL_LINK_NOARG(ScSelEntryDlg, DblClkHdl, ListBox&, void) { EndDialog( RET_OK ); } diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 143799d52ce3..37a6020c168b 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -86,7 +86,7 @@ short ScLinkedAreaDlg::Execute() #define FILTERNAME_HTML "HTML (StarCalc)" #define FILTERNAME_QUERY "calc_HTML_WebQuery" -IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, BrowseHdl, Button*, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl, Button*, void) { if ( !pDocInserter ) pDocInserter = new sfx2::DocumentInserter( @@ -94,7 +94,7 @@ IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, BrowseHdl, Button*, void) pDocInserter->StartExecuteModal( LINK( this, ScLinkedAreaDlg, DialogClosedHdl ) ); } -IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, FileHdl, ComboBox&, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl, ComboBox&, void) { OUString aEntered = m_pCbUrl->GetURL(); if (pSourceShell) @@ -187,17 +187,17 @@ void ScLinkedAreaDlg::InitFromOldLink( const OUString& rFile, const OUString& rF UpdateEnable(); } -IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, RangeHdl, ListBox&, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, RangeHdl, ListBox&, void) { UpdateEnable(); } -IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, ReloadHdl, Button*, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl, Button*, void) { UpdateEnable(); } -IMPL_LINK_TYPED( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { if ( _pFileDlg->GetError() != ERRCODE_NONE ) return; diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 869ffc8060f1..0b52193076c4 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -96,7 +96,7 @@ long ScMetricInputDlg::GetInputValue() const // Handler: -IMPL_LINK_NOARG_TYPED(ScMetricInputDlg, SetDefValHdl, Button*, void) +IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl, Button*, void) { if ( m_pBtnDefVal->IsChecked() ) { @@ -107,7 +107,7 @@ IMPL_LINK_NOARG_TYPED(ScMetricInputDlg, SetDefValHdl, Button*, void) m_pEdValue->SetValue( nCurrentValue ); } -IMPL_LINK_NOARG_TYPED(ScMetricInputDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScMetricInputDlg, ModifyHdl, Edit&, void) { m_pBtnDefVal->Check( nDefaultValue == m_pEdValue->GetValue() ); } diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 210830fa7188..1fc76699c805 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -255,13 +255,13 @@ void ScMoveTableDlg::InitDocListBox() // Handler: -IMPL_LINK_TYPED( ScMoveTableDlg, CheckBtnHdl, RadioButton&, rBtn, void ) +IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, RadioButton&, rBtn, void ) { if (&rBtn == pBtnCopy) ResetRenameInput(); } -IMPL_LINK_NOARG_TYPED(ScMoveTableDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl, Button*, void) { const sal_Int32 nDocSel = pLbDoc->GetSelectEntryPos(); const sal_Int32 nDocLast = pLbDoc->GetEntryCount()-1; @@ -294,7 +294,7 @@ IMPL_LINK_NOARG_TYPED(ScMoveTableDlg, OkHdl, Button*, void) EndDialog( RET_OK ); } -IMPL_LINK_TYPED( ScMoveTableDlg, SelHdl, ListBox&, rLb, void ) +IMPL_LINK( ScMoveTableDlg, SelHdl, ListBox&, rLb, void ) { if ( &rLb == pLbDoc ) { @@ -319,7 +319,7 @@ IMPL_LINK_TYPED( ScMoveTableDlg, SelHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScMoveTableDlg, CheckNameHdl, Edit&, rEdt, void ) +IMPL_LINK( ScMoveTableDlg, CheckNameHdl, Edit&, rEdt, void ) { if ( &rEdt == pEdTabName ) { diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 5b15550b2492..2d62a3308b37 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -120,7 +120,7 @@ void ScSolverSuccessDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( ScSolverSuccessDialog, ClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScSolverSuccessDialog, ClickHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) EndDialog(RET_OK); @@ -589,7 +589,7 @@ bool ScOptSolverDlg::IsRefInputMode() const // Handler: -IMPL_LINK_TYPED( ScOptSolverDlg, BtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScOptSolverDlg, BtnHdl, Button*, pBtn, void ) { if ( pBtn == m_pBtnSolve || pBtn == m_pBtnCancel ) { @@ -631,7 +631,7 @@ IMPL_LINK_TYPED( ScOptSolverDlg, BtnHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScOptSolverDlg, GetFocusHdl, Control&, rCtrl, void ) +IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control&, rCtrl, void ) { Edit* pEdit = nullptr; mpEdActive = nullptr; @@ -658,12 +658,12 @@ IMPL_LINK_TYPED( ScOptSolverDlg, GetFocusHdl, Control&, rCtrl, void ) pEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, LoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl, Control&, void) { mbDlgLostFocus = !IsActive(); } -IMPL_LINK_TYPED( ScOptSolverDlg, DelBtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScOptSolverDlg, DelBtnHdl, Button*, pBtn, void ) { for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) if( pBtn == mpDelButton[nRow] ) @@ -689,7 +689,7 @@ IMPL_LINK_TYPED( ScOptSolverDlg, DelBtnHdl, Button*, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, TargetModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl, Edit&, void) { // modify handler for the target edit: // select "Value of" if something is input into the edit @@ -697,21 +697,21 @@ IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, TargetModifyHdl, Edit&, void) m_pRbValue->Check(); } -IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, CondModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScOptSolverDlg, CondModifyHdl, Edit&, void) { // modify handler for the condition edits, just to enable/disable "delete" buttons ReadConditions(); EnableButtons(); } -IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScOptSolverDlg, SelectHdl, ListBox&, void) { // select handler for operator list boxes, just to enable/disable "delete" buttons ReadConditions(); EnableButtons(); } -IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ScOptSolverDlg, ScrollHdl, ScrollBar*, void) { ReadConditions(); nScrollPos = m_pScrollBar->GetThumbPos(); @@ -720,7 +720,7 @@ IMPL_LINK_NOARG_TYPED(ScOptSolverDlg, ScrollHdl, ScrollBar*, void) mpEdActive->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_TYPED( ScOptSolverDlg, CursorUpHdl, ScCursorRefEdit&, rEdit, void ) +IMPL_LINK( ScOptSolverDlg, CursorUpHdl, ScCursorRefEdit&, rEdit, void ) { if ( &rEdit == mpLeftEdit[0] || &rEdit == mpRightEdit[0] ) { @@ -751,7 +751,7 @@ IMPL_LINK_TYPED( ScOptSolverDlg, CursorUpHdl, ScCursorRefEdit&, rEdit, void ) } } -IMPL_LINK_TYPED( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit&, rEdit, void ) +IMPL_LINK( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit&, rEdit, void ) { if ( &rEdit == mpLeftEdit[EDIT_ROW_COUNT-1] || &rEdit == mpRightEdit[EDIT_ROW_COUNT-1] ) { diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index b7e5e0eea0e3..9375f3301073 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -120,7 +120,7 @@ void ScTableProtectionDlg::EnableOptionalWidgets(bool bEnable) m_pOptionsListBox->Invalidate(); } -IMPL_LINK_TYPED( ScTableProtectionDlg, CheckBoxHdl, Button*, pBtn, void ) +IMPL_LINK( ScTableProtectionDlg, CheckBoxHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnProtect) { @@ -130,12 +130,12 @@ IMPL_LINK_TYPED( ScTableProtectionDlg, CheckBoxHdl, Button*, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScTableProtectionDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(ScTableProtectionDlg, OKHdl, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(ScTableProtectionDlg, PasswordModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScTableProtectionDlg, PasswordModifyHdl, Edit&, void) { OUString aPass1 = m_pPassword1Edit->GetText(); OUString aPass2 = m_pPassword2Edit->GetText(); diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index 02d6ec9dc68f..39b8316597c7 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -149,7 +149,7 @@ void ScRedComDialog::SelectCell() } } -IMPL_LINK_TYPED(ScRedComDialog, PrevHdl, AbstractSvxPostItDialog&, rDlgP, void ) +IMPL_LINK(ScRedComDialog, PrevHdl, AbstractSvxPostItDialog&, rDlgP, void ) { if (pDocShell!=nullptr && rDlgP.GetNote() != aComment ) pDocShell->SetChangeComment( pChangeAction, rDlgP.GetNote()); @@ -158,7 +158,7 @@ IMPL_LINK_TYPED(ScRedComDialog, PrevHdl, AbstractSvxPostItDialog&, rDlgP, void ) SelectCell(); } -IMPL_LINK_TYPED(ScRedComDialog, NextHdl, AbstractSvxPostItDialog&, rDlgP, void ) +IMPL_LINK(ScRedComDialog, NextHdl, AbstractSvxPostItDialog&, rDlgP, void ) { if ( pDocShell!=nullptr && rDlgP.GetNote() != aComment ) pDocShell->SetChangeComment( pChangeAction, rDlgP.GetNote()); diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 124a4efde3e9..9f128e5c42ff 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -262,12 +262,12 @@ void ScRetypePassDlg::CheckHashStatus() mpBtnOk->Disable(); } -IMPL_LINK_NOARG_TYPED(ScRetypePassDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(ScRetypePassDlg, OKHdl, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_TYPED( ScRetypePassDlg, RetypeBtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, Button*, pBtn, void ) { ScPassHashProtectable* pProtected = nullptr; if (pBtn == mpBtnRetypeDoc) @@ -413,12 +413,12 @@ void ScRetypePassInputDlg::CheckPasswordInput() m_pBtnOk->Enable(bPassGood); } -IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(ScRetypePassInputDlg, OKHdl, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_TYPED( ScRetypePassInputDlg, RadioBtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScRetypePassInputDlg, RadioBtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnRetypePassword) { @@ -434,12 +434,12 @@ IMPL_LINK_TYPED( ScRetypePassInputDlg, RadioBtnHdl, Button*, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, CheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(ScRetypePassInputDlg, CheckBoxHdl, Button*, void) { CheckPasswordInput(); } -IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, PasswordModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScRetypePassInputDlg, PasswordModifyHdl, Edit&, void) { CheckPasswordInput(); } diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 8b9af01b3669..bc8d9afb65ea 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -162,7 +162,7 @@ void ScAutoFormatDlg::UpdateChecks() // Handler: -IMPL_LINK_TYPED( ScAutoFormatDlg, CloseHdl, Button *, pBtn, void ) +IMPL_LINK( ScAutoFormatDlg, CloseHdl, Button *, pBtn, void ) { if (pBtn == m_pBtnOk || pBtn == m_pBtnCancel) { @@ -173,7 +173,7 @@ IMPL_LINK_TYPED( ScAutoFormatDlg, CloseHdl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, DblClkHdl, ListBox&, void) +IMPL_LINK_NOARG(ScAutoFormatDlg, DblClkHdl, ListBox&, void) { if ( bCoreDataChanged ) ScGlobal::GetOrCreateAutoFormat()->Save(); @@ -181,7 +181,7 @@ IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, DblClkHdl, ListBox&, void) EndDialog( RET_OK ); } -IMPL_LINK_TYPED( ScAutoFormatDlg, CheckHdl, Button *, pBtn, void ) +IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn, void ) { ScAutoFormatData* pData = pFormat->findByIndex(nIndex); bool bCheck = static_cast<CheckBox*>(pBtn)->IsChecked(); @@ -208,7 +208,7 @@ IMPL_LINK_TYPED( ScAutoFormatDlg, CheckHdl, Button *, pBtn, void ) m_pWndPreview->NotifyChange( pData ); } -IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, AddHdl, Button*, void) +IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl, Button*, void) { if ( !bFmtInserted && pSelFmtData ) { @@ -276,7 +276,7 @@ IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, AddHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RemoveHdl, Button*, void) +IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl, Button*, void) { if ( (nIndex > 0) && (m_pLbFormat->GetEntryCount() > 0) ) { @@ -311,7 +311,7 @@ IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RemoveHdl, Button*, void) SelFmtHdl( *m_pLbFormat.get() ); } -IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RenameHdl, Button*, void) +IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl, Button*, void) { bool bOk = false; while( !bOk ) @@ -392,7 +392,7 @@ IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RenameHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, SelFmtHdl, ListBox&, void) +IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl, ListBox&, void) { nIndex = m_pLbFormat->GetSelectEntryPos(); UpdateChecks(); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 9ac5a5c049eb..91b4de526591 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -119,7 +119,7 @@ void ScShareDocumentDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(ScShareDocumentDlg, ToggleHandle, CheckBox&, void) +IMPL_LINK_NOARG(ScShareDocumentDlg, ToggleHandle, CheckBox&, void) { m_pFtWarning->Enable( m_pCbShare->IsChecked() ); } diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index f15bf266e498..530bea636bf8 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -81,7 +81,7 @@ sal_Int32 ScShowTabDlg::GetSelectEntryPos(sal_Int32 nPos) const return m_pLb->GetSelectEntryPos(nPos); } -IMPL_LINK_NOARG_TYPED(ScShowTabDlg, DblClkHdl, ListBox&, void) +IMPL_LINK_NOARG(ScShowTabDlg, DblClkHdl, ListBox&, void) { EndDialog( RET_OK ); } diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 233778601483..f9af2856c9d4 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -185,7 +185,7 @@ void ScSimpleRefDlg::RefInputDone( bool bForced) // Handler: -IMPL_LINK_NOARG_TYPED(ScSimpleRefDlg, OkBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl, Button*, void) { bAutoReOpen=false; OUString aResult=m_pEdAssign->GetText(); @@ -195,7 +195,7 @@ IMPL_LINK_NOARG_TYPED(ScSimpleRefDlg, OkBtnHdl, Button*, void) aUnoLink.Call( aResult ); } -IMPL_LINK_NOARG_TYPED(ScSimpleRefDlg, CancelBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl, Button*, void) { bAutoReOpen=false; OUString aResult=m_pEdAssign->GetText(); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 95c8239b4a32..28aeba7e0889 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -347,19 +347,19 @@ void ScSolverOptionsDialog::EditOption() } } -IMPL_LINK_TYPED( ScSolverOptionsDialog, ButtonHdl, Button*, pBtn, void ) +IMPL_LINK( ScSolverOptionsDialog, ButtonHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnEdit) EditOption(); } -IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, bool) { EditOption(); return false; } -IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, EngineSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl, ListBox&, void) { const sal_Int32 nSelectPos = m_pLbEngine->GetSelectEntryPos(); if ( nSelectPos < maImplNames.getLength() ) @@ -374,7 +374,7 @@ IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, EngineSelectHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, SettingsSelHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl, SvTreeListBox*, void) { bool bCheckbox = false; diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 34c079ac2425..1d41b94d08f8 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -199,7 +199,7 @@ bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal ) // Handler: -IMPL_LINK_TYPED( ScSolverDlg, BtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScSolverDlg, BtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) { @@ -255,7 +255,7 @@ IMPL_LINK_TYPED( ScSolverDlg, BtnHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScSolverDlg, GetFocusHdl, Control&, rCtrl, void ) +IMPL_LINK( ScSolverDlg, GetFocusHdl, Control&, rCtrl, void ) { Edit* pEdit = nullptr; pEdActive = nullptr; @@ -271,7 +271,7 @@ IMPL_LINK_TYPED( ScSolverDlg, GetFocusHdl, Control&, rCtrl, void ) pEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScSolverDlg, LoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScSolverDlg, LoseFocusHdl, Control&, void) { bDlgLostFocus = !IsActive(); } diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index f88ca418f68e..0f1cc1634740 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -114,7 +114,7 @@ void ScTabBgColorDlg::FillColorValueSets_Impl() } /// Handler, called when color selection is changed -IMPL_LINK_NOARG_TYPED(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, void) { sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO ); @@ -123,7 +123,7 @@ IMPL_LINK_NOARG_TYPED(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, vo } // Handler, called when the OK button is pushed -IMPL_LINK_NOARG_TYPED(ScTabBgColorDlg, TabBgColorOKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl, Button*, void) { sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO ); diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index ee458748f853..a796f251e3d7 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -244,7 +244,7 @@ static bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab, // Handler: -IMPL_LINK_TYPED( ScTabOpDlg, BtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScTabOpDlg, BtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) { @@ -322,7 +322,7 @@ IMPL_LINK_TYPED( ScTabOpDlg, BtnHdl, Button*, pBtn, void ) Close(); } -IMPL_LINK_TYPED( ScTabOpDlg, GetFocusHdl, Control&, rCtrl, void ) +IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control&, rCtrl, void ) { if( (&rCtrl == static_cast<Control*>(m_pEdFormulaRange)) || (&rCtrl == static_cast<Control*>(m_pRBFormulaRange)) ) pEdActive = m_pEdFormulaRange; @@ -337,7 +337,7 @@ IMPL_LINK_TYPED( ScTabOpDlg, GetFocusHdl, Control&, rCtrl, void ) pEdActive->SetSelection( Selection( 0, SELECTION_MAX ) ); } -IMPL_LINK_NOARG_TYPED(ScTabOpDlg, LoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl, Control&, void) { bDlgLostFocus = !IsActive(); } diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 7892d4977419..4584095dcc8f 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -319,22 +319,22 @@ void ScNameDefDlg::SetActive() RefInputDone(); } -IMPL_LINK_NOARG_TYPED(ScNameDefDlg, CancelBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDefDlg, CancelBtnHdl, Button*, void) { CancelPushed(); } -IMPL_LINK_NOARG_TYPED(ScNameDefDlg, AddBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDefDlg, AddBtnHdl, Button*, void) { AddPushed(); }; -IMPL_LINK_NOARG_TYPED(ScNameDefDlg, NameModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScNameDefDlg, NameModifyHdl, Edit&, void) { IsNameValid(); } -IMPL_LINK_NOARG_TYPED(ScNameDefDlg, AssignGetFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScNameDefDlg, AssignGetFocusHdl, Control&, void) { IsNameValid(); } diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 23f207aa7aeb..5a7a8f9df6dc 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -483,47 +483,47 @@ void ScNameDlg::GetRangeNames(std::map<OUString, std::unique_ptr<ScRangeName>>& m_RangeMap.swap(rRangeMap); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, OkBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDlg, OkBtnHdl, Button*, void) { Close(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, CancelBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDlg, CancelBtnHdl, Button*, void) { CancelPushed(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, AddBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDlg, AddBtnHdl, Button*, void) { AddPushed(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, RemoveBtnHdl, Button*, void) +IMPL_LINK_NOARG(ScNameDlg, RemoveBtnHdl, Button*, void) { RemovePushed(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, EdModifyCheckBoxHdl, CheckBox&, void) +IMPL_LINK_NOARG(ScNameDlg, EdModifyCheckBoxHdl, CheckBox&, void) { NameModified(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, EdModifyHdl, Edit&, void) +IMPL_LINK_NOARG(ScNameDlg, EdModifyHdl, Edit&, void) { NameModified(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, AssignGetFocusHdl, Control&, void) +IMPL_LINK_NOARG(ScNameDlg, AssignGetFocusHdl, Control&, void) { EdModifyHdl(*m_pEdAssign); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, SelectionChangedHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScNameDlg, SelectionChangedHdl_Impl, SvTreeListBox*, void) { SelectionChanged(); } -IMPL_LINK_NOARG_TYPED(ScNameDlg, ScopeChangedHdl, ListBox&, void) +IMPL_LINK_NOARG(ScNameDlg, ScopeChangedHdl, ListBox&, void) { ScopeChanged(); } diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index c15a2b7da6e2..a1ee00b1c441 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -277,7 +277,7 @@ void CalculateItemSize(long rTableSize, long& rItemNameSize, long& rItemRangeSiz } -IMPL_LINK_NOARG_TYPED(ScRangeManagerTable, HeaderEndDragHdl, HeaderBar*, void) +IMPL_LINK_NOARG(ScRangeManagerTable, HeaderEndDragHdl, HeaderBar*, void) { HeaderBar& rHeaderBar = GetTheHeaderBar(); @@ -300,7 +300,7 @@ IMPL_LINK_NOARG_TYPED(ScRangeManagerTable, HeaderEndDragHdl, HeaderBar*, void) SetTab(2, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width() ); } -IMPL_LINK_NOARG_TYPED(ScRangeManagerTable, ScrollHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScRangeManagerTable, ScrollHdl, SvTreeListBox*, void) { CheckForFormulaString(); } diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index f53d761ed87e..48bb5888301a 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -79,7 +79,7 @@ void ScNamePasteDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( ScNamePasteDlg, ButtonHdl, Button *, pButton, void ) +IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton, void ) { if( pButton == m_pBtnPasteAll ) { diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 8b6768cee6e0..dfc5e1026e47 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -343,7 +343,7 @@ static OUString lcl_GetDBAreaRange( ScDocument* pDoc, const OUString& rDBName ) return aRet; } -IMPL_LINK_NOARG_TYPED(ScContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) { ScContentId nType; sal_uLong nChild; @@ -1439,7 +1439,7 @@ void ScContentTree::DoDrag() delete pDocLoader; // falls Dokument zum Draggen geladen wurde } -IMPL_LINK_NOARG_TYPED(ScContentTree, ExecDragHdl, void*, void) +IMPL_LINK_NOARG(ScContentTree, ExecDragHdl, void*, void) { // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der // Navigator geloescht werden darf diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 3099de828dfc..ef6e00bd46c2 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -381,7 +381,7 @@ void CommandToolBox::Click() { } -IMPL_LINK_NOARG_TYPED(CommandToolBox, ToolBoxDropdownClickHdl, ToolBox *, void) +IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl, ToolBox *, void) { // the popup menue of the drop modus has to be called in the // click (button down) and not in the select (button up) @@ -886,7 +886,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -IMPL_LINK_TYPED( ScNavigatorDlg, TimeHdl, Idle*, pIdle, void ) +IMPL_LINK( ScNavigatorDlg, TimeHdl, Idle*, pIdle, void ) { if ( pIdle != &aContentIdle ) return; diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 20a7788c0319..2fe6d5b7df40 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -139,23 +139,23 @@ void ScCalcOptionsDialog::CoupleEmptyAsZeroToStringConversion() } } -IMPL_LINK_TYPED(ScCalcOptionsDialog, AsZeroModifiedHdl, Button*, pCheckBox, void ) +IMPL_LINK(ScCalcOptionsDialog, AsZeroModifiedHdl, Button*, pCheckBox, void ) { maConfig.mbEmptyStringAsZero = mbSelectedEmptyStringAsZero = static_cast<CheckBox*>(pCheckBox)->IsChecked(); } -IMPL_LINK_TYPED(ScCalcOptionsDialog, ConversionModifiedHdl, ListBox&, rConv, void ) +IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, ListBox&, rConv, void ) { maConfig.meStringConversion = (ScCalcConfig::StringConversion)rConv.GetSelectEntryPos(); CoupleEmptyAsZeroToStringConversion(); } -IMPL_LINK_TYPED(ScCalcOptionsDialog, SyntaxModifiedHdl, ListBox&, rSyntax, void) +IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, ListBox&, rSyntax, void) { maConfig.SetStringRefSyntax(toAddressConvention(rSyntax.GetSelectEntryPos())); } -IMPL_LINK_TYPED(ScCalcOptionsDialog, CurrentDocOnlyHdl, Button*, pCheckBox, void) +IMPL_LINK(ScCalcOptionsDialog, CurrentDocOnlyHdl, Button*, pCheckBox, void) { mbWriteConfig = !(static_cast<CheckBox*>(pCheckBox)->IsChecked()); } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 161e99d86b95..85509e350eee 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -38,10 +38,10 @@ public: virtual ~ScCalcOptionsDialog() override; virtual void dispose() override; - DECL_LINK_TYPED( AsZeroModifiedHdl, Button*, void); - DECL_LINK_TYPED( ConversionModifiedHdl, ListBox&, void); - DECL_LINK_TYPED( SyntaxModifiedHdl, ListBox&, void); - DECL_LINK_TYPED( CurrentDocOnlyHdl, Button*, void); + DECL_LINK( AsZeroModifiedHdl, Button*, void); + DECL_LINK( ConversionModifiedHdl, ListBox&, void); + DECL_LINK( SyntaxModifiedHdl, ListBox&, void); + DECL_LINK( CurrentDocOnlyHdl, Button*, void); const ScCalcConfig& GetConfig() const { return maConfig;} bool GetWriteCalcConfig() const { return mbWriteConfig;} diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index adb13de41bd2..b259c3d20c4a 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -218,7 +218,7 @@ DeactivateRC ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) // Handler: -IMPL_LINK_TYPED( ScTpCalcOptions, RadioClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScTpCalcOptions, RadioClickHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnDateStd) { @@ -234,7 +234,7 @@ IMPL_LINK_TYPED( ScTpCalcOptions, RadioClickHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScTpCalcOptions, CheckClickHdl, Button*, p, void ) +IMPL_LINK( ScTpCalcOptions, CheckClickHdl, Button*, p, void ) { CheckBox* pBtn = static_cast<CheckBox*>(p); if (pBtn == m_pBtnGeneralPrec) diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 6236853c44b4..4f9d10a7f1ad 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -122,17 +122,17 @@ void ScTpDefaultsOptions::OnFocusPrefixInput(Edit* pEdit) maOldPrefixValue = pEdit->GetText(); } -IMPL_LINK_NOARG_TYPED(ScTpDefaultsOptions, NumModifiedHdl, Edit&, void) +IMPL_LINK_NOARG(ScTpDefaultsOptions, NumModifiedHdl, Edit&, void) { CheckNumSheets(); } -IMPL_LINK_TYPED( ScTpDefaultsOptions, PrefixModifiedHdl, Edit&, rEdit, void ) +IMPL_LINK( ScTpDefaultsOptions, PrefixModifiedHdl, Edit&, rEdit, void ) { CheckPrefix(&rEdit); } -IMPL_LINK_TYPED( ScTpDefaultsOptions, PrefixEditOnFocusHdl, Control&, rControl, void ) +IMPL_LINK( ScTpDefaultsOptions, PrefixEditOnFocusHdl, Control&, rControl, void ) { OnFocusPrefixInput(static_cast<Edit*>(&rControl)); } diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 02fdef56e578..4e5b34d7102d 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -196,7 +196,7 @@ bool ScTpFormulaOptions::IsValidSeparatorSet() const return true; } -IMPL_LINK_TYPED( ScTpFormulaOptions, ButtonHdl, Button*, pBtn, void ) +IMPL_LINK( ScTpFormulaOptions, ButtonHdl, Button*, pBtn, void ) { if (pBtn == mpBtnSepReset) ResetSeparators(); @@ -208,7 +208,7 @@ IMPL_LINK_TYPED( ScTpFormulaOptions, ButtonHdl, Button*, pBtn, void ) LaunchCustomCalcSettings(); } -IMPL_LINK_TYPED( ScTpFormulaOptions, SepModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, Edit&, rEdit, void ) { OUString aStr = rEdit.GetText(); if (aStr.getLength() > 1) @@ -226,7 +226,7 @@ IMPL_LINK_TYPED( ScTpFormulaOptions, SepModifyHdl, Edit&, rEdit, void ) OnFocusSeparatorInput(&rEdit); } -IMPL_LINK_TYPED( ScTpFormulaOptions, SepEditOnFocusHdl, Control&, rControl, void ) +IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Control&, rControl, void ) { OnFocusSeparatorInput(static_cast<Edit*>(&rControl)); } diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index a6b9edd1b996..da2987118ea8 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -451,7 +451,7 @@ void ScTpUserLists::RemoveList( size_t nList ) // Handler: -IMPL_LINK_TYPED( ScTpUserLists, LbSelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox&, rLb, void ) { if ( &rLb == mpLbLists ) { @@ -472,7 +472,7 @@ IMPL_LINK_TYPED( ScTpUserLists, LbSelectHdl, ListBox&, rLb, void ) } } -IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void ) { if ( pBtn == mpBtnNew || pBtn == mpBtnDiscard ) { @@ -701,7 +701,7 @@ IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( ScTpUserLists, EdEntriesModHdl, Edit&, rEd, void ) +IMPL_LINK( ScTpUserLists, EdEntriesModHdl, Edit&, rEd, void ) { if ( &rEd != mpEdEntries ) return; diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 4b4aa46f6ba1..4db904780c82 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -242,7 +242,7 @@ DeactivateRC ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) return DeactivateRC::LeavePage; } -IMPL_LINK_TYPED( ScTpContentOptions, SelLbObjHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox&, rLb, void ) { const sal_Int32 nSelPos = rLb.GetSelectEntryPos(); ScVObjMode eMode = ScVObjMode(nSelPos); @@ -256,7 +256,7 @@ IMPL_LINK_TYPED( ScTpContentOptions, SelLbObjHdl, ListBox&, rLb, void ) pLocalOptions->SetObjMode( eType, eMode ); } -IMPL_LINK_TYPED( ScTpContentOptions, CBHdl, Button*, pBtn, void ) +IMPL_LINK( ScTpContentOptions, CBHdl, Button*, pBtn, void ) { ScViewOption eOption = VOPT_FORMULAS; bool bChecked = static_cast<CheckBox*>(pBtn)->IsChecked(); @@ -356,7 +356,7 @@ void ScTpContentOptions::InitGridOpt() pColorLB->SelectEntryPos( pColorLB->InsertEntry( aCol, aName ) ); } -IMPL_LINK_TYPED( ScTpContentOptions, GridHdl, ListBox&, rLb, void ) +IMPL_LINK( ScTpContentOptions, GridHdl, ListBox&, rLb, void ) { sal_Int32 nSelPos = rLb.GetSelectEntryPos(); bool bGrid = ( nSelPos <= 1 ); @@ -678,7 +678,7 @@ DeactivateRC ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) return DeactivateRC::LeavePage; } -IMPL_LINK_NOARG_TYPED(ScTpLayoutOptions, MetricHdl, ListBox&, void) +IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl, ListBox&, void) { const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos(); if(nMPos != LISTBOX_ENTRY_NOTFOUND) @@ -691,7 +691,7 @@ IMPL_LINK_NOARG_TYPED(ScTpLayoutOptions, MetricHdl, ListBox&, void) } } -IMPL_LINK_TYPED( ScTpLayoutOptions, AlignHdl, Button*, pBox, void ) +IMPL_LINK( ScTpLayoutOptions, AlignHdl, Button*, pBox, void ) { m_pAlignLB->Enable(static_cast<CheckBox*>(pBox)->IsChecked()); } diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index de2a9e28d5a1..d2bc314226b4 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -468,7 +468,7 @@ void ScPrintAreasDlg::Impl_FillLists() // Handler: -IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_BtnHdl, Button*, pBtn, void ) +IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, Button*, pBtn, void ) { if ( pBtnOk == pBtn ) { @@ -516,7 +516,7 @@ IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_BtnHdl, Button*, pBtn, void ) Close(); } -IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_GetFocusHdl, Control&, rCtrl, void ) +IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control&, rCtrl, void ) { if ( &rCtrl ==static_cast<Control *>(pEdPrintArea) || &rCtrl ==static_cast<Control *>(pEdRepeatRow) || @@ -538,7 +538,7 @@ IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_GetFocusHdl, Control&, rCtrl, void ) } } -IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_SelectHdl, ListBox&, rLb, void ) +IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox&, rLb, void ) { ListBox* pLb = &rLb; const sal_Int32 nSelPos = pLb->GetSelectEntryPos(); @@ -573,7 +573,7 @@ IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_SelectHdl, ListBox&, rLb, void ) pEd->SetText( *static_cast< OUString* >( pLb->GetEntryData( nSelPos ) ) ); } -IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_ModifyHdl, Edit&, rEd, void ) +IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, Edit&, rEd, void ) { ListBox* pLb = nullptr; diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index e27cd12800de..b1e2bdd6b534 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -154,7 +154,7 @@ ScHFEditPage::ScHFEditPage( vcl::Window* pParent, } -IMPL_LINK_NOARG_TYPED( ScHFEditPage, ObjectSelectHdl, ScEditWindow&, void ) +IMPL_LINK_NOARG( ScHFEditPage, ObjectSelectHdl, ScEditWindow&, void ) { m_pBtnText->GrabFocus(); } @@ -755,7 +755,7 @@ void ScHFEditPage::ClearTextAreas() // Handler: -IMPL_LINK_TYPED( ScHFEditPage, ListHdl_Impl, ListBox&, rList, void ) +IMPL_LINK( ScHFEditPage, ListHdl_Impl, ListBox&, rList, void ) { if ( &rList == m_pLbDefined ) { @@ -775,7 +775,7 @@ IMPL_LINK_TYPED( ScHFEditPage, ListHdl_Impl, ListBox&, rList, void ) } } -IMPL_LINK_TYPED( ScHFEditPage, ClickHdl, Button*, pBtn, void ) +IMPL_LINK( ScHFEditPage, ClickHdl, Button*, pBtn, void ) { if (!m_pEditFocus) return; @@ -805,7 +805,7 @@ IMPL_LINK_TYPED( ScHFEditPage, ClickHdl, Button*, pBtn, void ) m_pEditFocus->GrabFocus(); } -IMPL_LINK_TYPED( ScHFEditPage, MenuHdl, ScExtIButton&, rBtn, void ) +IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton&, rBtn, void ) { if (!m_pEditFocus) return; diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 1b4e5ecd89c8..a5cb7116a982 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -147,7 +147,7 @@ void ScHFPage::DeactivatePage() // Handler: -IMPL_LINK_NOARG_TYPED(ScHFPage, TurnOnHdl, Button*, void) +IMPL_LINK_NOARG(ScHFPage, TurnOnHdl, Button*, void) { SvxHFPage::TurnOnHdl( m_pTurnOnBox ); @@ -157,7 +157,7 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, TurnOnHdl, Button*, void) m_pBtnEdit->Disable(); } -IMPL_LINK_NOARG_TYPED(ScHFPage, BtnHdl, Button*, void) +IMPL_LINK_NOARG(ScHFPage, BtnHdl, Button*, void) { // When the Edit-Dialog is directly called from the Button's Click-Handler, // the GrabFocus from the Edit-Dialog under OS/2 doesn't work.(Bug #41805#). @@ -166,7 +166,7 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, BtnHdl, Button*, void) Application::PostUserEvent( LINK( this, ScHFPage, HFEditHdl ), nullptr, true ); } -IMPL_LINK_NOARG_TYPED(ScHFPage, HFEditHdl, void*, void) +IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void) { SfxViewShell* pViewSh = SfxViewShell::Current(); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index cb6335229a67..248fae39f890 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -423,7 +423,7 @@ bool ScExtIButton::PreNotify( NotifyEvent& rNEvt ) return ImageButton::PreNotify(rNEvt ); } -IMPL_LINK_NOARG_TYPED(ScExtIButton, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScExtIButton, TimerHdl, Idle *, void) { StartPopup(); } diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 27eecb86d29f..1ea9e0f8160a 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -358,12 +358,12 @@ void ScTablePage::DataChanged( const DataChangedEvent& rDCEvt ) // Handler: -IMPL_LINK_NOARG_TYPED(ScTablePage, PageDirHdl, Button*, void) +IMPL_LINK_NOARG(ScTablePage, PageDirHdl, Button*, void) { ShowImage(); } -IMPL_LINK_TYPED( ScTablePage, PageNoHdl, Button*, pBtn, void ) +IMPL_LINK( ScTablePage, PageNoHdl, Button*, pBtn, void ) { if ( m_pBtnPageNo->IsChecked() ) { @@ -375,7 +375,7 @@ IMPL_LINK_TYPED( ScTablePage, PageNoHdl, Button*, pBtn, void ) m_pEdPageNo->Disable(); } -IMPL_LINK_NOARG_TYPED(ScTablePage, ScaleHdl, ListBox&, void) +IMPL_LINK_NOARG(ScTablePage, ScaleHdl, ListBox&, void) { // controls for Box "Reduce/enlarge" m_pBxScaleAll->Show(m_pLbScaleMode->GetSelectEntryPos() == SC_TPTABLE_SCALE_PERCENT); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index c093237f07d3..e1b0993ab03f 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -133,7 +133,7 @@ void AlignmentPropertyPanel::Initialize() mpMtrAngle->SetDropDownLineCount(mpMtrAngle->GetEntryCount()); } -IMPL_LINK_TYPED( AlignmentPropertyPanel, ReferenceEdgeHdl, Button*, pControl, void ) +IMPL_LINK( AlignmentPropertyPanel, ReferenceEdgeHdl, Button*, pControl, void ) { SvxRotateMode eMode; if(pControl == mpRefEdgeBottom) @@ -147,7 +147,7 @@ IMPL_LINK_TYPED( AlignmentPropertyPanel, ReferenceEdgeHdl, Button*, pControl, vo SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED( AlignmentPropertyPanel, AngleModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl, Edit&, void ) { OUString sTmp = mpMtrAngle->GetText(); if (sTmp.isEmpty()) @@ -184,14 +184,14 @@ IMPL_LINK_NOARG_TYPED( AlignmentPropertyPanel, AngleModifiedHdl, Edit&, void ) GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, { &aAngleItem }); } -IMPL_LINK_NOARG_TYPED( AlignmentPropertyPanel, ClickStackHdl, Button*, void ) +IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl, Button*, void ) { bool bVertical = mpCBStacked->IsChecked(); SfxBoolItem aStackItem( SID_ATTR_ALIGN_STACKED, bVertical ); GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_ALIGN_STACKED, SfxCallMode::RECORD, { &aStackItem }); } -IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, MFLeftIndentMdyHdl, Edit&, void) +IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl, Edit&, void) { mpCBXWrapText->EnableTriState(false); sal_uInt16 nVal = (sal_uInt16)mpMFLeftIndent->GetValue(); @@ -201,7 +201,7 @@ IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, MFLeftIndentMdyHdl, Edit&, void) SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, CBOXMergnCellClkHdl, Button*, void) +IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl, Button*, void) { bool bState = mpCBXMergeCell->IsChecked(); @@ -216,7 +216,7 @@ IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, CBOXMergnCellClkHdl, Button*, void //modified end } -IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, CBOXWrapTextClkHdl, Button*, void) +IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXWrapTextClkHdl, Button*, void) { bool bState = mpCBXWrapText->IsChecked(); SfxBoolItem aItem( SID_ATTR_ALIGN_LINEBREAK , bState); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index fa90bd944a23..a635a241ef51 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -95,12 +95,12 @@ private: vcl::EnumContext maContext; SfxBindings* mpBindings; - DECL_LINK_TYPED( MFLeftIndentMdyHdl, Edit&, void ); - DECL_LINK_TYPED( CBOXMergnCellClkHdl, Button*, void ); - DECL_LINK_TYPED( CBOXWrapTextClkHdl, Button*, void ); - DECL_LINK_TYPED( AngleModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( ClickStackHdl, Button*, void ); - DECL_LINK_TYPED( ReferenceEdgeHdl, Button*, void ); + DECL_LINK( MFLeftIndentMdyHdl, Edit&, void ); + DECL_LINK( CBOXMergnCellClkHdl, Button*, void ); + DECL_LINK( CBOXWrapTextClkHdl, Button*, void ); + DECL_LINK( AngleModifiedHdl, Edit&, void ); + DECL_LINK( ClickStackHdl, Button*, void ); + DECL_LINK( ReferenceEdgeHdl, Button*, void ); void Initialize(); static void FormatDegrees(double& dTmp); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index be8a6f2e8471..84c07426973f 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -151,7 +151,7 @@ void CellAppearancePropertyPanel::Initialize() mpTBLineColor->Disable(); } -IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox, void) +IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox, void) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -164,7 +164,7 @@ IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, p } } -IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox, void) +IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox, void) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 20347c2eef5e..d7d36ec78ddd 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -181,8 +181,8 @@ private: vcl::EnumContext maContext; SfxBindings* mpBindings; - DECL_LINK_TYPED(TbxCellBorderSelectHdl, ToolBox*, void); - DECL_LINK_TYPED(TbxLineStyleSelectHdl, ToolBox*, void); + DECL_LINK(TbxCellBorderSelectHdl, ToolBox*, void); + DECL_LINK(TbxLineStyleSelectHdl, ToolBox*, void); void Initialize(); void SetStyleIcon(); diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 1c505d957fea..6e0409ab0842 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -147,7 +147,7 @@ void CellBorderStyleControl::Initialize() maTBBorder3->SetSelectHdl ( LINK(this, CellBorderStyleControl, TB3SelectHdl) ); } -IMPL_LINK_TYPED(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox, void) +IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox, void) { sal_uInt16 nId = pToolBox->GetCurItemId(); SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER ); @@ -206,7 +206,7 @@ IMPL_LINK_TYPED(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox, void) mxFloatParent->EndPopupMode(); } -IMPL_LINK_TYPED(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox, void) +IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox, void) { sal_uInt16 nId = pToolBox->GetCurItemId(); @@ -293,7 +293,7 @@ IMPL_LINK_TYPED(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox, void) mxFloatParent->EndPopupMode(); } -IMPL_LINK_TYPED(CellBorderStyleControl, TB3SelectHdl, ToolBox *, pToolBox, void) +IMPL_LINK(CellBorderStyleControl, TB3SelectHdl, ToolBox *, pToolBox, void) { sal_uInt16 nId = pToolBox->GetCurItemId(); diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index bc37be4880e2..ea8c7619872e 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -42,9 +42,9 @@ private: void Initialize(); - DECL_LINK_TYPED(TB1SelectHdl, ToolBox *, void); - DECL_LINK_TYPED(TB2SelectHdl, ToolBox *, void); - DECL_LINK_TYPED(TB3SelectHdl, ToolBox *, void); + DECL_LINK(TB1SelectHdl, ToolBox *, void); + DECL_LINK(TB2SelectHdl, ToolBox *, void); + DECL_LINK(TB3SelectHdl, ToolBox *, void); public: CellBorderStyleControl(FloatingWindow* pParent, SfxDispatcher* pDispatcher); diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 6de614d9c736..e9e68a335a32 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -113,7 +113,7 @@ void CellLineStyleControl::SetAllNoSel() maCellLineStyleValueSet->StartSelection(); } -IMPL_LINK_TYPED(CellLineStyleControl, VSSelectHdl, ValueSet*, pControl, void) +IMPL_LINK(CellLineStyleControl, VSSelectHdl, ValueSet*, pControl, void) { if(pControl == maCellLineStyleValueSet.get()) { @@ -185,7 +185,7 @@ IMPL_LINK_TYPED(CellLineStyleControl, VSSelectHdl, ValueSet*, pControl, void) } } -IMPL_LINK_TYPED(CellLineStyleControl, PBClickHdl, Button *, pPBtn, void) +IMPL_LINK(CellLineStyleControl, PBClickHdl, Button *, pPBtn, void) { if (pPBtn == maPushButtonMoreOptions.get()) { diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index bad5780810a7..93548495d4d6 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -41,8 +41,8 @@ private: void Initialize(); void SetAllNoSel(); - DECL_LINK_TYPED(VSSelectHdl, ValueSet*, void); - DECL_LINK_TYPED(PBClickHdl, Button*, void); + DECL_LINK(VSSelectHdl, ValueSet*, void); + DECL_LINK(PBClickHdl, Button*, void); public: CellLineStyleControl(FloatingWindow* pParent, SfxDispatcher* pDispatcher); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 550ba6f34754..8fdc1772fd0d 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -104,7 +104,7 @@ void NumberFormatPropertyPanel::Initialize() mpBtnEngineering->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) ); } -IMPL_LINK_TYPED( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, void ) +IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, void ) { const sal_Int32 nVal = rBox.GetSelectEntryPos(); if( nVal != mnCategorySelected ) @@ -116,11 +116,11 @@ IMPL_LINK_TYPED( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, } } -IMPL_LINK_NOARG_TYPED( NumberFormatPropertyPanel, NumFormatValueClickHdl, Button*, void ) +IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueClickHdl, Button*, void ) { NumFormatValueHdl(*mpEdDecimals); } -IMPL_LINK_NOARG_TYPED( NumberFormatPropertyPanel, NumFormatValueHdl, Edit&, void ) +IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueHdl, Edit&, void ) { OUString aFormat; OUString sBreak = ","; diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index fb0f57b10509..2a3bffa5114f 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -84,9 +84,9 @@ private: vcl::EnumContext maContext; SfxBindings* mpBindings; - DECL_LINK_TYPED(NumFormatSelectHdl, ListBox&, void); - DECL_LINK_TYPED(NumFormatValueHdl, Edit&, void); - DECL_LINK_TYPED(NumFormatValueClickHdl, Button*, void); + DECL_LINK(NumFormatSelectHdl, ListBox&, void); + DECL_LINK(NumFormatValueHdl, Edit&, void); + DECL_LINK(NumFormatValueClickHdl, Button*, void); void Initialize(); void DisableControls(); diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 39f82fefb391..96ab146a85d5 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2803,7 +2803,7 @@ void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< OSL_FAIL("not implemented"); } -IMPL_LINK_TYPED( ScCellRangesBase, ValueListenerHdl, const SfxHint&, rHint, void ) +IMPL_LINK( ScCellRangesBase, ValueListenerHdl, const SfxHint&, rHint, void ) { if ( pDocShell && (rHint.GetId() & SC_HINT_DATACHANGED)) { diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 2fce34a9c611..c77fa56a6311 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2916,7 +2916,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint } } -IMPL_LINK_TYPED( ScChart2DataSequence, ValueListenerHdl, const SfxHint&, rHint, void ) +IMPL_LINK( ScChart2DataSequence, ValueListenerHdl, const SfxHint&, rHint, void ) { if ( m_pDocument && (rHint.GetId() & SC_HINT_DATACHANGED) ) { diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 431fe640987b..050d41052fa2 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -161,7 +161,7 @@ private: /** Posts a Workbook_WindowResize user event. */ void postWindowResizeEvent( vcl::Window* pWindow ); /** Callback link for Application::PostUserEvent(). */ - DECL_LINK_TYPED( processWindowResizeEvent, void*, void ); + DECL_LINK( processWindowResizeEvent, void*, void ); private: typedef ::std::map< VclPtr<vcl::Window>, uno::Reference< frame::XController > > WindowControllerMap; @@ -478,7 +478,7 @@ void ScVbaEventListener::postWindowResizeEvent( vcl::Window* pWindow ) } } -IMPL_LINK_TYPED( ScVbaEventListener, processWindowResizeEvent, void*, p, void ) +IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, void*, p, void ) { vcl::Window* pWindow = static_cast<vcl::Window*>(p); ::osl::MutexGuard aGuard( maMutex ); diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index a6318211acef..b29beaeba461 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -487,7 +487,7 @@ static bool lcl_IsCellPastePossible( const TransferableDataHelper& rData ) return bPossible; } -IMPL_LINK_TYPED( ScCellShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) +IMPL_LINK( ScCellShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) { bPastePossible = lcl_IsCellPastePossible( *pDataHelper ); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index af92bf76aa84..777bcd76ea00 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2908,7 +2908,7 @@ void ScCellShell::ExecuteFillSingleEdit() SC_MOD()->SetInputMode(SC_INPUT_TABLE, &aInit); } -IMPL_LINK_NOARG_TYPED(ScCellShell, DialogClosed, Dialog&, void) +IMPL_LINK_NOARG(ScCellShell, DialogClosed, Dialog&, void) { assert(pImpl->m_pLinkedDlg && "ScCellShell::DialogClosed(): invalid request"); assert(pImpl->m_pRequest && "ScCellShell::DialogClosed(): invalid request"); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 5782387e0787..fc0c29bd10e4 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -797,7 +797,7 @@ const SvxURLField* ScEditShell::GetURLField() return nullptr; } -IMPL_LINK_TYPED( ScEditShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) +IMPL_LINK( ScEditShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void ) { bPastePossible = ( pDataHelper->HasFormat( SotClipboardFormatId::STRING ) || pDataHelper->HasFormat( SotClipboardFormatId::RTF ) ); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index f58f500e666a..5ffad27f03ec 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -549,14 +549,14 @@ void ScGridWindow::ClickExtern() } } -IMPL_LINK_NOARG_TYPED(ScGridWindow, PopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(ScGridWindow, PopupModeEndHdl, FloatingWindow*, void) { if (mpFilterBox) mpFilterBox->SetCancelled(); // cancel select GrabFocus(); } -IMPL_LINK_TYPED( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo&, rInfo, void ) +IMPL_LINK( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo&, rInfo, void ) { if( rInfo.nCommand == SpellCallbackCommand::STARTSPELLDLG ) pViewData->GetDispatcher().Execute( SID_SPELL_DIALOG, SfxCallMode::ASYNCHRON ); @@ -5484,10 +5484,10 @@ struct SpellCheckStatus SpellCheckStatus() : mbModified(false) {}; - DECL_LINK_TYPED( EventHdl, EditStatus&, void ); + DECL_LINK( EventHdl, EditStatus&, void ); }; -IMPL_LINK_TYPED(SpellCheckStatus, EventHdl, EditStatus&, rStatus, void) +IMPL_LINK(SpellCheckStatus, EventHdl, EditStatus&, rStatus, void) { EditStatusFlags nStatus = rStatus.GetStatusWord(); if (nStatus & EditStatusFlags::WRONGWORDCHANGED) diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 6b05c2bf4556..818f9fc76a12 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -71,7 +71,7 @@ ScNoteMarker::~ScNoteMarker() delete pModel; } -IMPL_LINK_NOARG_TYPED(ScNoteMarker, TimeHdl, Timer *, void) +IMPL_LINK_NOARG(ScNoteMarker, TimeHdl, Timer *, void) { if (!bVisible) { diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index d4ee167a72f1..1e916697ae2f 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -929,7 +929,7 @@ void ScPreview::StaticInvalidate() rBindings.Invalidate(SID_ATTR_ZOOMSLIDER); } -IMPL_STATIC_LINK_NOARG_TYPED( ScPreview, InvalidateHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( ScPreview, InvalidateHdl, void*, void ) { StaticInvalidate(); } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index eb80b302b0c1..b1c0089ff11c 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -404,7 +404,7 @@ void ScPreviewShell::UpdateScrollBars() } } -IMPL_LINK_TYPED( ScPreviewShell, ScrollHandler, ScrollBar*, pScroll, void ) +IMPL_LINK( ScPreviewShell, ScrollHandler, ScrollBar*, pScroll, void ) { long nPos = pScroll->GetThumbPos(); long nDelta = pScroll->GetDelta(); @@ -475,7 +475,7 @@ IMPL_LINK_TYPED( ScPreviewShell, ScrollHandler, ScrollBar*, pScroll, void ) } } -IMPL_LINK_NOARG_TYPED(ScPreviewShell, CloseHdl, SystemWindow&, void) +IMPL_LINK_NOARG(ScPreviewShell, CloseHdl, SystemWindow&, void) { ExitPreview(); } diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 24e96633b76d..50cbec9d4ca0 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -84,7 +84,7 @@ ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData ) SetScrollAreaContextHdl( LINK( this, ScTabControl, ShowPageList ) ); } -IMPL_LINK_TYPED(ScTabControl, ShowPageList, const CommandEvent &, rEvent, void) +IMPL_LINK(ScTabControl, ShowPageList, const CommandEvent &, rEvent, void) { ScopedVclPtrInstance<PopupMenu> aPopup; diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 1686e3b18b40..c6b1673a0464 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -266,7 +266,7 @@ void ScTabView::ResetTimer() pTimerWindow = nullptr; } -IMPL_LINK_NOARG_TYPED(ScTabView, TimerHdl, Timer *, void) +IMPL_LINK_NOARG(ScTabView, TimerHdl, Timer *, void) { if (pTimerWindow) pTimerWindow->MouseMove( aTimerMEvt ); @@ -837,7 +837,7 @@ void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ ) ::std::swap( rBorder.Left(), rBorder.Right() ); } -IMPL_LINK_NOARG_TYPED(ScTabView, TabBarResize, TabBar*, void) +IMPL_LINK_NOARG(ScTabView, TabBarResize, TabBar*, void) { if (aViewData.IsHScrollMode()) { @@ -1014,7 +1014,7 @@ bool ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ) return bDone; } -IMPL_LINK_NOARG_TYPED(ScTabView, EndScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ScTabView, EndScrollHdl, ScrollBar*, void) { if ( bDragging ) { @@ -1023,7 +1023,7 @@ IMPL_LINK_NOARG_TYPED(ScTabView, EndScrollHdl, ScrollBar*, void) } } -IMPL_LINK_TYPED( ScTabView, ScrollHdl, ScrollBar*, pScroll, void ) +IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll, void ) { bool bHoriz = ( pScroll == aHScrollLeft.get() || pScroll == aHScrollRight.get() ); long nViewPos; @@ -1527,7 +1527,7 @@ bool ScTabView::UpdateVisibleRange() // --- Splitter -------------------------------------------------------- -IMPL_LINK_TYPED( ScTabView, SplitHdl, Splitter*, pSplitter, void ) +IMPL_LINK( ScTabView, SplitHdl, Splitter*, pSplitter, void ) { if ( pSplitter == pHSplitter ) DoHSplit( pHSplitter->GetSplitPosPixel() ); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index c82210680f0a..160dc436c9d5 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -983,7 +983,7 @@ void ScTabViewShell::SetFormShellAtTop( bool bSet ) } } -IMPL_LINK_NOARG_TYPED(ScTabViewShell, FormControlActivated, LinkParamNone*, void) +IMPL_LINK_NOARG(ScTabViewShell, FormControlActivated, LinkParamNone*, void) { // a form control got the focus, so the form shell has to be on top SetFormShellAtTop( true ); @@ -1082,7 +1082,7 @@ void ScTabViewShell::StopEditShell() // close handler to ensure function of dialog: -IMPL_LINK_NOARG_TYPED(ScTabViewShell, SimpleRefClose, const OUString*, void) +IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose, const OUString*, void) { SfxInPlaceClient* pClient = GetIPClient(); if ( pClient && pClient->IsObjectInPlaceActive() ) @@ -1112,21 +1112,21 @@ static ScTabViewObj* lcl_GetViewObj( ScTabViewShell& rShell ) return pRet; } -IMPL_LINK_TYPED( ScTabViewShell, SimpleRefDone, const OUString&, aResult, void ) +IMPL_LINK( ScTabViewShell, SimpleRefDone, const OUString&, aResult, void ) { ScTabViewObj* pImpObj = lcl_GetViewObj( *this ); if ( pImpObj ) pImpObj->RangeSelDone( aResult ); } -IMPL_LINK_TYPED( ScTabViewShell, SimpleRefAborted, const OUString&, rResult, void ) +IMPL_LINK( ScTabViewShell, SimpleRefAborted, const OUString&, rResult, void ) { ScTabViewObj* pImpObj = lcl_GetViewObj( *this ); if ( pImpObj ) pImpObj->RangeSelAborted( rResult ); } -IMPL_LINK_TYPED( ScTabViewShell, SimpleRefChange, const OUString&, rResult, void ) +IMPL_LINK( ScTabViewShell, SimpleRefChange, const OUString&, rResult, void ) { ScTabViewObj* pImpObj = lcl_GetViewObj( *this ); if ( pImpObj ) diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 77d9f42df304..8e2dd1592d00 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1175,7 +1175,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, } -IMPL_LINK_TYPED( ScViewData, EditEngineHdl, EditStatus&, rStatus, void ) +IMPL_LINK( ScViewData, EditEngineHdl, EditStatus&, rStatus, void ) { EditStatusFlags nStatus = rStatus.GetStatusWord(); if (nStatus & (EditStatusFlags::HSCROLL | EditStatusFlags::TEXTHEIGHTCHANGED | EditStatusFlags::TEXTWIDTHCHANGED | EditStatusFlags::CURSOROUT)) diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 879f41c40ba7..435e81b58254 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -662,12 +662,12 @@ void ScXMLSourceDlg::RefEditModified() mpBtnOk->Enable(bHasLink); } -IMPL_LINK_TYPED(ScXMLSourceDlg, GetFocusHdl, Control&, rCtrl, void) +IMPL_LINK(ScXMLSourceDlg, GetFocusHdl, Control&, rCtrl, void) { HandleGetFocus(&rCtrl); } -IMPL_LINK_TYPED(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn, void) +IMPL_LINK(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn, void) { if (pBtn == mpBtnSelectSource) SelectSourceFile(); @@ -677,12 +677,12 @@ IMPL_LINK_TYPED(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn, void) CancelPressed(); } -IMPL_LINK_NOARG_TYPED(ScXMLSourceDlg, TreeItemSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(ScXMLSourceDlg, TreeItemSelectHdl, SvTreeListBox*, void) { TreeItemSelected(); } -IMPL_LINK_NOARG_TYPED(ScXMLSourceDlg, RefModifiedHdl, Edit&, void) +IMPL_LINK_NOARG(ScXMLSourceDlg, RefModifiedHdl, Edit&, void) { RefEditModified(); } |