diff options
Diffstat (limited to 'extensions/source')
63 files changed, 167 insertions, 167 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 16c1e87f975b..de43b117c49e 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -211,13 +211,13 @@ namespace abp } - IMPL_LINK_NOARG_TYPED( FinalPage, OnNameModified, Edit&, void ) + IMPL_LINK_NOARG( FinalPage, OnNameModified, Edit&, void ) { implCheckName(); } - IMPL_LINK_NOARG_TYPED(FinalPage, OnRegister, Button*, void) + IMPL_LINK_NOARG(FinalPage, OnRegister, Button*, void) { bool bEnable = m_pRegisterName->IsChecked(); m_pNameLabel->Enable(bEnable); @@ -225,7 +225,7 @@ namespace abp implCheckName(); } - IMPL_LINK_NOARG_TYPED(FinalPage, OnEmbed, Button*, void) + IMPL_LINK_NOARG(FinalPage, OnEmbed, Button*, void) { bool bEmbed = m_pEmbed->IsChecked(); m_pLocationLabel->Enable(!bEmbed); diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index 6fa03f4b4bb5..4766006cdf97 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -67,9 +67,9 @@ namespace abp virtual bool canAdvance() const override; private: - DECL_LINK_TYPED( OnNameModified, Edit&, void ); - DECL_LINK_TYPED(OnRegister, Button*, void); - DECL_LINK_TYPED(OnEmbed, Button*, void); + DECL_LINK( OnNameModified, Edit&, void ); + DECL_LINK(OnRegister, Button*, void); + DECL_LINK(OnEmbed, Button*, void); bool isValidName() const; void implCheckName(); diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 5eee1ca3037d..c24f55da2a58 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -174,7 +174,7 @@ namespace abp } - IMPL_LINK_NOARG_TYPED( OAddressBookSourcePilot, OnCancelClicked, Button*, void ) + IMPL_LINK_NOARG( OAddressBookSourcePilot, OnCancelClicked, Button*, void ) { // do cleanups implCleanup(); diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index 41c216425335..545a090cea2f 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -74,7 +74,7 @@ namespace abp virtual bool Close() override; private: - DECL_LINK_TYPED( OnCancelClicked, Button*, void ); + DECL_LINK( OnCancelClicked, Button*, void ); /** creates a new data source of the type indicated by m_aSettings <p>If another data source has been created before, this one is deleted.</p> diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx index f23fb988949f..af975768d3b4 100644 --- a/extensions/source/abpilot/admininvokationpage.cxx +++ b/extensions/source/abpilot/admininvokationpage.cxx @@ -82,7 +82,7 @@ namespace abp } // davido: Do we need it? - IMPL_LINK_NOARG_TYPED( AdminDialogInvokationPage, OnInvokeAdminDialog, Button*, void ) + IMPL_LINK_NOARG( AdminDialogInvokationPage, OnInvokeAdminDialog, Button*, void ) { OAdminDialogInvokation aInvokation( getORB(), getDialog()->getDataSource().getDataSource(), getDialog() ); if ( aInvokation.invokeAdministration() ) diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx index ce94f61dc9a8..bb03aba0c1b2 100644 --- a/extensions/source/abpilot/admininvokationpage.hxx +++ b/extensions/source/abpilot/admininvokationpage.hxx @@ -44,7 +44,7 @@ namespace abp virtual bool canAdvance() const override; private: - DECL_LINK_TYPED( OnInvokeAdminDialog, Button*, void ); + DECL_LINK( OnInvokeAdminDialog, Button*, void ); void implTryConnect(); void implUpdateErrorMessage(); diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx index d135a19bb7c8..93ebe3f22710 100644 --- a/extensions/source/abpilot/fieldmappingpage.cxx +++ b/extensions/source/abpilot/fieldmappingpage.cxx @@ -72,7 +72,7 @@ namespace abp } - IMPL_LINK_NOARG_TYPED( FieldMappingPage, OnInvokeDialog, Button*, void ) + IMPL_LINK_NOARG( FieldMappingPage, OnInvokeDialog, Button*, void ) { AddressSettings& rSettings = getSettings(); diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx index 32b23133a826..edb34f14de05 100644 --- a/extensions/source/abpilot/fieldmappingpage.hxx +++ b/extensions/source/abpilot/fieldmappingpage.hxx @@ -45,7 +45,7 @@ namespace abp virtual void ActivatePage() override; private: - DECL_LINK_TYPED( OnInvokeDialog, Button*, void ); + DECL_LINK( OnInvokeDialog, Button*, void ); void implUpdateHint(); }; diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx index 95286851a87a..8cd92bb9a892 100644 --- a/extensions/source/abpilot/tableselectionpage.cxx +++ b/extensions/source/abpilot/tableselectionpage.cxx @@ -80,14 +80,14 @@ namespace abp } - IMPL_LINK_NOARG_TYPED( TableSelectionPage, OnTableDoubleClicked, ListBox&, void ) + IMPL_LINK_NOARG( TableSelectionPage, OnTableDoubleClicked, ListBox&, void ) { if ( 1 == m_pTableList->GetSelectEntryCount() ) getDialog()->travelNext(); } - IMPL_LINK_NOARG_TYPED( TableSelectionPage, OnTableSelected, ListBox&, void ) + IMPL_LINK_NOARG( TableSelectionPage, OnTableSelected, ListBox&, void ) { updateDialogTravelUI(); } diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx index 681d9dc90fc2..595faf69885c 100644 --- a/extensions/source/abpilot/tableselectionpage.hxx +++ b/extensions/source/abpilot/tableselectionpage.hxx @@ -49,8 +49,8 @@ namespace abp virtual bool canAdvance() const override; private: - DECL_LINK_TYPED( OnTableSelected, ListBox&, void ); - DECL_LINK_TYPED( OnTableDoubleClicked, ListBox&, void ); + DECL_LINK( OnTableSelected, ListBox&, void ); + DECL_LINK( OnTableDoubleClicked, ListBox&, void ); }; diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 3b3551c9dd98..524bdaa6c7dd 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -245,7 +245,7 @@ namespace abp } - IMPL_LINK_NOARG_TYPED( TypeSelectionPage, OnTypeSelected, Button*, void ) + IMPL_LINK_NOARG( TypeSelectionPage, OnTypeSelected, Button*, void ) { getDialog()->typeSelectionChanged( getSelectedType() ); updateDialogTravelUI(); diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx index 8bfa4aa13dfb..d757cfcd15ad 100644 --- a/extensions/source/abpilot/typeselectionpage.hxx +++ b/extensions/source/abpilot/typeselectionpage.hxx @@ -78,7 +78,7 @@ namespace abp virtual bool canAdvance() const override; private: - DECL_LINK_TYPED( OnTypeSelected, Button*, void ); + DECL_LINK( OnTypeSelected, Button*, void ); void selectType( AddressSourceType _eType ); }; diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index d0a488dc77b1..a3e7e530ab6d 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -267,7 +267,7 @@ namespace bib pGridWin->GrabFocus(); } - IMPL_LINK_NOARG_TYPED( BibBeamer, RecalcLayout_Impl, void*, void ) + IMPL_LINK_NOARG( BibBeamer, RecalcLayout_Impl, void*, void ) { long nHeight = pToolBar->get_preferred_size().Height(); SetItemSize( ID_TOOLBAR, nHeight ); diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index ea03b209c55a..b69aa41b8fe9 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -51,7 +51,7 @@ namespace bib VclPtr<BibToolBar> pToolBar; VclPtr<BibGridwin> pGridWin; - DECL_LINK_TYPED( RecalcLayout_Impl, void*, void ); + DECL_LINK( RecalcLayout_Impl, void*, void ); protected: diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx index 53f177beb98a..834d400fae46 100644 --- a/extensions/source/bibliography/bibcont.cxx +++ b/extensions/source/bibliography/bibcont.cxx @@ -160,7 +160,7 @@ void BibBookContainer::Split() { aIdle.Start(); } -IMPL_LINK_NOARG_TYPED( BibBookContainer, SplitHdl, Idle*, void) +IMPL_LINK_NOARG( BibBookContainer, SplitHdl, Idle*, void) { long nSize= GetItemSize( TOP_WINDOW); BibConfig* pConfig = BibModul::GetConfig(); diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx index 6b6435c1c8b9..f8547538d222 100644 --- a/extensions/source/bibliography/bibcont.hxx +++ b/extensions/source/bibliography/bibcont.hxx @@ -72,7 +72,7 @@ class BibBookContainer: public BibSplitWindow HdlBibModul pBibMod; Idle aIdle; - DECL_LINK_TYPED( SplitHdl, Idle*, void ); + DECL_LINK( SplitHdl, Idle*, void ); protected: diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 74de227ff6de..91e7a3ea80a6 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -175,7 +175,7 @@ namespace bib mpBibView->Resize(); } - IMPL_LINK_NOARG_TYPED( BibView, CallMappingHdl, void*, void) + IMPL_LINK_NOARG( BibView, CallMappingHdl, void*, void) { m_pDatMan->CreateMappingDialog( this ); } diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index 8e68191a9ec1..6b1e9743b5ba 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -63,7 +63,7 @@ namespace bib BibViewFormControlContainer m_aFormControlContainer; private: - DECL_LINK_TYPED(CallMappingHdl, void*, void); + DECL_LINK(CallMappingHdl, void*, void); public: // Window overridables diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 5062274d449a..6508e542e2af 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -236,8 +236,8 @@ class MappingDialog_Impl : public ModalDialog bool bModified; - DECL_LINK_TYPED(OkHdl, Button*, void); - DECL_LINK_TYPED(ListBoxSelectHdl, ListBox&, void); + DECL_LINK(OkHdl, Button*, void); + DECL_LINK(ListBoxSelectHdl, ListBox&, void); public: MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pDatMan); @@ -422,7 +422,7 @@ void MappingDialog_Impl::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED(MappingDialog_Impl, ListBoxSelectHdl, ListBox&, rListBox, void) +IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox&, rListBox, void) { const sal_Int32 nEntryPos = rListBox.GetSelectEntryPos(); if(0 < nEntryPos) @@ -436,7 +436,7 @@ IMPL_LINK_TYPED(MappingDialog_Impl, ListBoxSelectHdl, ListBox&, rListBox, void) SetModified(); } -IMPL_LINK_NOARG_TYPED(MappingDialog_Impl, OkHdl, Button*, void) +IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl, Button*, void) { if(bModified) { @@ -473,7 +473,7 @@ class DBChangeDialog_Impl : public ModalDialog BibDataManager* pDatMan; - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); public: DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan ); virtual ~DBChangeDialog_Impl() override; @@ -512,7 +512,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* p } } -IMPL_LINK_NOARG_TYPED(DBChangeDialog_Impl, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(DBChangeDialog_Impl, DoubleClickHdl, ListBox&, void) { EndDialog(RET_OK); } diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index b1bceba699fb..65e1d061fcd2 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -626,7 +626,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } } } -IMPL_LINK_NOARG_TYPED( BibFrameController_Impl, DisposeHdl, void*, void ) +IMPL_LINK_NOARG( BibFrameController_Impl, DisposeHdl, void*, void ) { xFrame->dispose(); }; diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index 2efbbd0d3eed..6810af9e221d 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -70,7 +70,7 @@ friend class BibFrameCtrl_Impl; BibDataManager* pDatMan; HdlBibModul pBibMod; - DECL_LINK_TYPED( DisposeHdl, void*, void ); + DECL_LINK( DisposeHdl, void*, void ); static bool SaveModified(const css::uno::Reference< css::form::runtime::XFormController>& xController); public: diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 3a487e6f4b6b..db6fb3edf1fa 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -468,12 +468,12 @@ bool BibToolBar::PreNotify( NotifyEvent& rNEvt ) return bResult; } -IMPL_LINK_NOARG_TYPED( BibToolBar, SelHdl, ListBox&, void ) +IMPL_LINK_NOARG( BibToolBar, SelHdl, ListBox&, void ) { aIdle.Start(); } -IMPL_LINK_NOARG_TYPED( BibToolBar, SendSelHdl, Idle*, void ) +IMPL_LINK_NOARG( BibToolBar, SendSelHdl, Idle*, void ) { Sequence<PropertyValue> aPropVal(1); PropertyValue* pPropertyVal = const_cast<PropertyValue*>(aPropVal.getConstArray()); @@ -483,7 +483,7 @@ IMPL_LINK_NOARG_TYPED( BibToolBar, SendSelHdl, Idle*, void ) SendDispatch(nTBC_LB_SOURCE, aPropVal); } -IMPL_LINK_NOARG_TYPED( BibToolBar, MenuHdl, ToolBox*, void) +IMPL_LINK_NOARG( BibToolBar, MenuHdl, ToolBox*, void) { sal_uInt16 nId=GetCurItemId(); if (nId == nTBC_BT_AUTOFILTER) @@ -536,7 +536,7 @@ void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt ) ToolBox::DataChanged( rDCEvt ); } -IMPL_LINK_NOARG_TYPED( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void ) +IMPL_LINK_NOARG( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void ) { bool bRebuildToolBar = false; sal_Int16 eSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); @@ -557,7 +557,7 @@ IMPL_LINK_NOARG_TYPED( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void ) } -IMPL_LINK_NOARG_TYPED( BibToolBar, SettingsChanged_Impl, VclSimpleEvent&, void ) +IMPL_LINK_NOARG( BibToolBar, SettingsChanged_Impl, VclSimpleEvent&, void ) { // Check if toolbar button size have changed and we have to use system settings sal_Int16 eSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index e8ae3c5cd54d..e6f4d1abc40b 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -135,11 +135,11 @@ class BibToolBar: public ToolBox sal_uInt16 nTBC_BT_REMOVEFILTER; BibDataManager* pDatMan; - DECL_LINK_TYPED( SelHdl, ListBox&, void ); - DECL_LINK_TYPED( SendSelHdl, Idle*, void ); - DECL_LINK_TYPED( MenuHdl, ToolBox*, void ); - DECL_LINK_TYPED( OptionsChanged_Impl, LinkParamNone*, void ); - DECL_LINK_TYPED( SettingsChanged_Impl, VclSimpleEvent&, void ); + DECL_LINK( SelHdl, ListBox&, void ); + DECL_LINK( SendSelHdl, Idle*, void ); + DECL_LINK( MenuHdl, ToolBox*, void ); + DECL_LINK( OptionsChanged_Impl, LinkParamNone*, void ); + DECL_LINK( SettingsChanged_Impl, VclSimpleEvent&, void ); void ApplyImageList(); void RebuildToolbar(); diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index aec95586715e..84ee2e173d94 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -193,7 +193,7 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED( OTableSelectionPage, OnSearchClicked, Button*, void ) + IMPL_LINK_NOARG( OTableSelectionPage, OnSearchClicked, Button*, void ) { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION); @@ -217,14 +217,14 @@ namespace dbp } } - IMPL_LINK_TYPED( OTableSelectionPage, OnListboxDoubleClicked, ListBox&, _rBox, void ) + IMPL_LINK( OTableSelectionPage, OnListboxDoubleClicked, ListBox&, _rBox, void ) { if (_rBox.GetSelectEntryCount()) getDialog()->travelNext(); } - IMPL_LINK_TYPED( OTableSelectionPage, OnListboxSelection, ListBox&, _rBox, void ) + IMPL_LINK( OTableSelectionPage, OnListboxSelection, ListBox&, _rBox, void ) { if (m_pDatasource == &_rBox) { // new data source selected @@ -408,7 +408,7 @@ namespace dbp implEnableWindows(); } - IMPL_LINK_NOARG_TYPED( OMaybeListSelectionPage, OnRadioSelected, Button*, void ) + IMPL_LINK_NOARG( OMaybeListSelectionPage, OnRadioSelected, Button*, void ) { implEnableWindows(); } diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 71c2a5f5e5bc..345113939c5b 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -54,9 +54,9 @@ namespace dbp virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; protected: - DECL_LINK_TYPED( OnListboxSelection, ListBox&, void ); - DECL_LINK_TYPED( OnListboxDoubleClicked, ListBox&, void ); - DECL_LINK_TYPED( OnSearchClicked, Button*, void ); + DECL_LINK( OnListboxSelection, ListBox&, void ); + DECL_LINK( OnListboxDoubleClicked, ListBox&, void ); + DECL_LINK( OnSearchClicked, Button*, void ); void implCollectDatasource(); void implFillTables(const css::uno::Reference< css::sdbc::XConnection >& @@ -79,7 +79,7 @@ namespace dbp virtual void dispose() override; protected: - DECL_LINK_TYPED( OnRadioSelected, Button*, void ); + DECL_LINK( OnRadioSelected, Button*, void ); // TabPage overridables void ActivatePage() override; diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index ae2c63ff9265..3795fa5e0bab 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -391,7 +391,7 @@ namespace dbp } - IMPL_LINK_TYPED(OGridFieldsSelection, OnEntryDoubleClicked, ListBox&, _rList, void) + IMPL_LINK(OGridFieldsSelection, OnEntryDoubleClicked, ListBox&, _rList, void) { PushButton* pSimulateButton = m_pExistFields == &_rList ? m_pSelectOne : m_pDeselectOne; if (pSimulateButton->IsEnabled()) @@ -401,13 +401,13 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED(OGridFieldsSelection, OnEntrySelected, ListBox&, void) + IMPL_LINK_NOARG(OGridFieldsSelection, OnEntrySelected, ListBox&, void) { implCheckButtons(); } - IMPL_LINK_TYPED(OGridFieldsSelection, OnMoveOneEntry, Button*, _pButton, void) + IMPL_LINK(OGridFieldsSelection, OnMoveOneEntry, Button*, _pButton, void) { bool bMoveRight = (m_pSelectOne == _pButton); ListBox& rMoveTo = bMoveRight ? *m_pSelFields : *m_pExistFields; @@ -461,7 +461,7 @@ namespace dbp } - IMPL_LINK_TYPED(OGridFieldsSelection, OnMoveAllEntries, Button*, _pButton, void) + IMPL_LINK(OGridFieldsSelection, OnMoveAllEntries, Button*, _pButton, void) { bool bMoveRight = (m_pSelectAll == _pButton); m_pExistFields->Clear(); diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index b03a754e267a..efb8a8488f07 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -94,10 +94,10 @@ namespace dbp virtual bool canAdvance() const override; protected: - DECL_LINK_TYPED(OnMoveOneEntry, Button*, void); - DECL_LINK_TYPED(OnMoveAllEntries, Button*, void); - DECL_LINK_TYPED(OnEntrySelected, ListBox&, void); - DECL_LINK_TYPED(OnEntryDoubleClicked, ListBox&, void); + DECL_LINK(OnMoveOneEntry, Button*, void); + DECL_LINK(OnMoveAllEntries, Button*, void); + DECL_LINK(OnEntrySelected, ListBox&, void); + DECL_LINK(OnEntryDoubleClicked, ListBox&, void); void implCheckButtons(); }; diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 66237014d9af..ddce66693089 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -259,7 +259,7 @@ namespace dbp } - IMPL_LINK_TYPED( ORadioSelectionPage, OnMoveEntry, Button*, _pButton, void ) + IMPL_LINK( ORadioSelectionPage, OnMoveEntry, Button*, _pButton, void ) { bool bMoveLeft = (m_pMoveLeft == _pButton); if (bMoveLeft) @@ -283,13 +283,13 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED( ORadioSelectionPage, OnEntrySelected, ListBox&, void ) + IMPL_LINK_NOARG( ORadioSelectionPage, OnEntrySelected, ListBox&, void ) { implCheckMoveButtons(); } - IMPL_LINK_NOARG_TYPED( ORadioSelectionPage, OnNameModified, Edit&, void ) + IMPL_LINK_NOARG( ORadioSelectionPage, OnNameModified, Edit&, void ) { implCheckMoveButtons(); } @@ -401,7 +401,7 @@ namespace dbp OGBWPage::dispose(); } - IMPL_LINK_NOARG_TYPED( OOptionValuesPage, OnOptionSelected, ListBox&, void ) + IMPL_LINK_NOARG( OOptionValuesPage, OnOptionSelected, ListBox&, void ) { implTraveledOptions(); } diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index e028357515f0..92ddc89cabaf 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -99,9 +99,9 @@ namespace dbp virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; virtual bool canAdvance() const override; - DECL_LINK_TYPED( OnMoveEntry, Button*, void ); - DECL_LINK_TYPED( OnEntrySelected, ListBox&, void ); - DECL_LINK_TYPED( OnNameModified, Edit&, void ); + DECL_LINK( OnMoveEntry, Button*, void ); + DECL_LINK( OnEntrySelected, ListBox&, void ); + DECL_LINK( OnNameModified, Edit&, void ); void implCheckMoveButtons(); }; @@ -151,7 +151,7 @@ namespace dbp void implTraveledOptions(); - DECL_LINK_TYPED( OnOptionSelected, ListBox&, void ); + DECL_LINK( OnOptionSelected, ListBox&, void ); }; class OOptionDBFieldPage : public ODBFieldPage diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index d7a764b22fb9..10087cf0044a 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -298,13 +298,13 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED( OContentTableSelection, OnTableSelected, ListBox&, void ) + IMPL_LINK_NOARG( OContentTableSelection, OnTableSelected, ListBox&, void ) { updateDialogTravelUI(); } - IMPL_LINK_TYPED( OContentTableSelection, OnTableDoubleClicked, ListBox&, _rListBox, void ) + IMPL_LINK( OContentTableSelection, OnTableDoubleClicked, ListBox&, _rListBox, void ) { if (_rListBox.GetSelectEntryCount()) getDialog()->travelNext(); @@ -399,14 +399,14 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED( OContentFieldSelection, OnTableDoubleClicked, ListBox&, void ) + IMPL_LINK_NOARG( OContentFieldSelection, OnTableDoubleClicked, ListBox&, void ) { if (m_pSelectTableField->GetSelectEntryCount()) getDialog()->travelNext(); } - IMPL_LINK_NOARG_TYPED( OContentFieldSelection, OnFieldSelected, ListBox&, void ) + IMPL_LINK_NOARG( OContentFieldSelection, OnFieldSelected, ListBox&, void ) { updateDialogTravelUI(); m_pDisplayedField->SetText(m_pSelectTableField->GetSelectEntry()); @@ -486,12 +486,12 @@ namespace dbp } - IMPL_LINK_NOARG_TYPED(OLinkFieldsPage, OnSelectionModified, Edit&, void) + IMPL_LINK_NOARG(OLinkFieldsPage, OnSelectionModified, Edit&, void) { implCheckFinish(); } - IMPL_LINK_NOARG_TYPED(OLinkFieldsPage, OnSelectionModifiedCombBox, ComboBox&, void) + IMPL_LINK_NOARG(OLinkFieldsPage, OnSelectionModifiedCombBox, ComboBox&, void) { implCheckFinish(); } diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index a1d0e4237111..6a4d7489b536 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -113,8 +113,8 @@ namespace dbp virtual bool canAdvance() const override; protected: - DECL_LINK_TYPED( OnTableDoubleClicked, ListBox&, void ); - DECL_LINK_TYPED( OnTableSelected, ListBox&, void ); + DECL_LINK( OnTableDoubleClicked, ListBox&, void ); + DECL_LINK( OnTableSelected, ListBox&, void ); }; class OContentFieldSelection : public OLCPage @@ -131,8 +131,8 @@ namespace dbp virtual void dispose() override; protected: - DECL_LINK_TYPED( OnFieldSelected, ListBox&, void ); - DECL_LINK_TYPED( OnTableDoubleClicked, ListBox&, void ); + DECL_LINK( OnFieldSelected, ListBox&, void ); + DECL_LINK( OnTableDoubleClicked, ListBox&, void ); // TabPage overridables virtual void ActivatePage() override; @@ -167,8 +167,8 @@ namespace dbp private: void implCheckFinish(); - DECL_LINK_TYPED(OnSelectionModified, Edit&, void); - DECL_LINK_TYPED(OnSelectionModifiedCombBox, ComboBox&, void); + DECL_LINK(OnSelectionModified, Edit&, void); + DECL_LINK(OnSelectionModifiedCombBox, ComboBox&, void); }; class OComboDBFieldPage : public ODBFieldPage diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index ad5b9b4c7ed3..c223cc6dc305 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -471,14 +471,14 @@ namespace pcr } - IMPL_LINK_TYPED( OBrowserLine, OnButtonClicked, Button*, _pButton, void ) + IMPL_LINK( OBrowserLine, OnButtonClicked, Button*, _pButton, void ) { if ( m_pClickListener ) m_pClickListener->buttonClicked( this, _pButton == m_pBrowseButton ); } - IMPL_LINK_NOARG_TYPED( OBrowserLine, OnButtonFocus, Control&, void ) + IMPL_LINK_NOARG( OBrowserLine, OnButtonFocus, Control&, void ) { if ( m_xControl.is() ) { diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 7b61eca74a6f..5442c193a883 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -113,8 +113,8 @@ namespace pcr void IndentTitle( bool _bIndent ); private: - DECL_LINK_TYPED( OnButtonClicked, Button*, void ); - DECL_LINK_TYPED( OnButtonFocus, Control&, void ); + DECL_LINK( OnButtonClicked, Button*, void ); + DECL_LINK( OnButtonFocus, Control&, void ); void implHideBrowseButton( bool _bPrimary, bool _bReLayout ); void implUpdateEnabledDisabled(); diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 86bd00caec55..bd9758a3fcf5 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -839,7 +839,7 @@ namespace pcr } - IMPL_LINK_TYPED(OBrowserListBox, ScrollHdl, ScrollBar*, _pScrollBar, void ) + IMPL_LINK(OBrowserListBox, ScrollHdl, ScrollBar*, _pScrollBar, void ) { DBG_ASSERT(_pScrollBar == m_aVScroll.get(), "OBrowserListBox::ScrollHdl: where does this come from?"); (void)_pScrollBar; diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 325afbe8fe76..9ef2c6fe2c54 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -155,7 +155,7 @@ namespace pcr using Window::SetHelpText; private: - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); /** retrieves the index of a given control in our line list @param _rxControl diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 276c5248c65e..d31417c85cf6 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -40,7 +40,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED(OPropertyBrowserView, OnPageActivation, LinkParamNone*, void) + IMPL_LINK_NOARG(OPropertyBrowserView, OnPageActivation, LinkParamNone*, void) { m_nActivePage = m_pPropBox->GetCurPage(); m_aPageActivationHandler.Call(nullptr); diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 2589a833a6bb..9057f754b48c 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -60,7 +60,7 @@ namespace pcr css::awt::Size getMinimumSize(); protected: - DECL_LINK_TYPED(OnPageActivation, LinkParamNone*, void); + DECL_LINK(OnPageActivation, LinkParamNone*, void); }; diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index 4d37c7077500..745880465b52 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -94,17 +94,17 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, EditModifiedHdl, Edit&, void ) + IMPL_LINK_NOARG( CommonBehaviourControlHelper, EditModifiedHdl, Edit&, void ) { setModified(); } - IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, ModifiedHdl, ListBox&, void ) + IMPL_LINK_NOARG( CommonBehaviourControlHelper, ModifiedHdl, ListBox&, void ) { setModified(); } - IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, GetFocusHdl, Control&, void ) + IMPL_LINK_NOARG( CommonBehaviourControlHelper, GetFocusHdl, Control&, void ) { try { @@ -118,7 +118,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, LoseFocusHdl, Control&, void ) + IMPL_LINK_NOARG( CommonBehaviourControlHelper, LoseFocusHdl, Control&, void ) { // TODO/UNOize: should this be outside the default control's implementations? If somebody // has an own control implementation, which does *not* do this - would this be allowed? diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index f8c18336177d..da0fe76d8307 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -89,10 +89,10 @@ namespace pcr virtual vcl::Window* getVclWindow() = 0; /// may be used by derived classes, they forward the event to the PropCtrListener - DECL_LINK_TYPED( ModifiedHdl, ListBox&, void ); - DECL_LINK_TYPED( EditModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( ModifiedHdl, ListBox&, void ); + DECL_LINK( EditModifiedHdl, Edit&, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); }; diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 0078123cd0e4..e6b40c64e8da 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -3224,7 +3224,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( FormComponentPropertyHandler, OnDesignerClosed, SQLCommandDesigner&, void ) + IMPL_LINK_NOARG( FormComponentPropertyHandler, OnDesignerClosed, SQLCommandDesigner&, void ) { OSL_ENSURE( m_xBrowserUI.is() && m_xCommandDesigner.is(), "FormComponentPropertyHandler::OnDesignerClosed: too many NULLs!" ); if ( m_xBrowserUI.is() && m_xCommandDesigner.is() ) diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 71c83c57dcd0..0041b124068e 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -430,7 +430,7 @@ namespace pcr OUString impl_getDocumentURL_nothrow() const; private: - DECL_LINK_TYPED( OnDesignerClosed, SQLCommandDesigner&, void ); + DECL_LINK( OnDesignerClosed, SQLCommandDesigner&, void ); private: FormComponentPropertyHandler( const FormComponentPropertyHandler& ) = delete; diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 22e9dc321382..500bbc982053 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -92,7 +92,7 @@ namespace pcr void fillList( LinkParticipant _eWhich, const Sequence< OUString >& _rFieldNames ); private: - DECL_LINK_TYPED( OnFieldNameChanged, Edit&, void ); + DECL_LINK( OnFieldNameChanged, Edit&, void ); }; @@ -147,7 +147,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( FieldLinkRow, OnFieldNameChanged, Edit&, void ) + IMPL_LINK_NOARG( FieldLinkRow, OnFieldNameChanged, Edit&, void ) { m_aLinkChangeHandler.Call( *this ); } @@ -658,19 +658,19 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnSuggest, Button*, void ) + IMPL_LINK_NOARG( FormLinkDialog, OnSuggest, Button*, void ) { initializeFieldRowsFrom( m_aRelationDetailColumns, m_aRelationMasterColumns ); } - IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnFieldChanged, FieldLinkRow&, void ) + IMPL_LINK_NOARG( FormLinkDialog, OnFieldChanged, FieldLinkRow&, void ) { updateOkButton(); } - IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnInitialize, void*, void ) + IMPL_LINK_NOARG( FormLinkDialog, OnInitialize, void*, void ) { initializeColumnLabels(); initializeFieldLists(); diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 215f02e7c9a3..867c16ab9fdb 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -84,9 +84,9 @@ namespace pcr virtual short Execute() override; private: - DECL_LINK_TYPED( OnSuggest, Button*, void ); - DECL_LINK_TYPED( OnFieldChanged, FieldLinkRow&, void ); - DECL_LINK_TYPED( OnInitialize, void*, void); + DECL_LINK( OnSuggest, Button*, void ); + DECL_LINK( OnFieldChanged, FieldLinkRow&, void ); + DECL_LINK( OnInitialize, void*, void); void updateOkButton(); void initializeFieldLists(); diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index f2905002eea7..0fae03df4f7d 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -77,7 +77,7 @@ namespace pcr ModalDialog::dispose(); } - IMPL_LINK_NOARG_TYPED( NewDataTypeDialog, OnNameModified, Edit&, void ) + IMPL_LINK_NOARG( NewDataTypeDialog, OnNameModified, Edit&, void ) { OUString sCurrentName = GetName(); bool bNameIsOK = ( !sCurrentName.isEmpty() ) diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index 94fd4e8b396b..e45a8a4a1e1b 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -49,7 +49,7 @@ namespace pcr OUString GetName() const { return m_pName->GetText(); } private: - DECL_LINK_TYPED( OnNameModified, Edit&, void ); + DECL_LINK( OnNameModified, Edit&, void ); }; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index eda77ceda855..23cf9720d5d5 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -637,7 +637,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED(OPropertyBrowserController, OnPageActivation, LinkParamNone*, void) + IMPL_LINK_NOARG(OPropertyBrowserController, OnPageActivation, LinkParamNone*, void) { updateViewDataFromActivePage(); } diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index e7e289a59941..b771e67471f7 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -384,7 +384,7 @@ namespace pcr void impl_startOrStopModelListening_nothrow( bool _bDoListen ) const; private: - DECL_LINK_TYPED(OnPageActivation, LinkParamNone*, void); + DECL_LINK(OnPageActivation, LinkParamNone*, void); private: // constructors diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 128ffa20fabb..76013a7771e1 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -505,13 +505,13 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED(OPropertyEditor, OnPageActivate, TabControl*, void) + IMPL_LINK_NOARG(OPropertyEditor, OnPageActivate, TabControl*, void) { m_aPageActivationHandler.Call(nullptr); } - IMPL_LINK_NOARG_TYPED(OPropertyEditor, OnPageDeactivate, TabControl *, bool) + IMPL_LINK_NOARG(OPropertyEditor, OnPageDeactivate, TabControl *, bool) { // commit the data on the current (to-be-deactivated) tab page // (79404) diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index e5cba4ecb2f8..03be07a963b7 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -135,8 +135,8 @@ namespace pcr void setHelpLineLimits( OBrowserPage& _rPage, const void* ); protected: - DECL_LINK_TYPED(OnPageDeactivate, TabControl*, bool); - DECL_LINK_TYPED(OnPageActivate, TabControl*, void); + DECL_LINK(OnPageDeactivate, TabControl*, bool); + DECL_LINK(OnPageActivate, TabControl*, void); }; diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 35eac6e12d1a..2310a7d13f2b 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -240,7 +240,7 @@ namespace pcr } - IMPL_LINK_TYPED(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB, void) + IMPL_LINK(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB, void) { DBG_ASSERT(pLB == m_pControlTree, "OSelectLabelDialog::OnEntrySelected : where did this come from ?"); (void)pLB; @@ -256,7 +256,7 @@ namespace pcr } - IMPL_LINK_TYPED(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton, void) + IMPL_LINK(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton, void) { DBG_ASSERT(pButton == m_pNoAssignment, "OSelectLabelDialog::OnNoAssignmentClicked : where did this come from ?"); (void)pButton; diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 3cdfee4927f8..b16c19bf4509 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -64,8 +64,8 @@ namespace pcr protected: sal_Int32 InsertEntries(const css::uno::Reference< css::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry); - DECL_LINK_TYPED(OnEntrySelected, SvTreeListBox*, void); - DECL_LINK_TYPED(OnNoAssignmentClicked, Button*, void); + DECL_LINK(OnEntrySelected, SvTreeListBox*, void); + DECL_LINK(OnNoAssignmentClicked, Button*, void); }; diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index ce0f6ecdc850..ca2412f9dbad 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -459,7 +459,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( OHyperlinkControl, OnHyperlinkClicked, void*, void ) + IMPL_LINK_NOARG( OHyperlinkControl, OnHyperlinkClicked, void*, void ) { ActionEvent aEvent( *this, OUString( "clicked" ) ); m_aActionListeners.forEach< XActionListener >( @@ -941,7 +941,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( OComboboxControl, OnEntrySelected, ComboBox&, void ) + IMPL_LINK_NOARG( OComboboxControl, OnEntrySelected, ComboBox&, void ) { if ( !getTypedControlWindow()->IsTravelSelect() ) // fire a commit @@ -1299,7 +1299,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( DropDownEditControl, ReturnHdl, FloatingWindow*, void) + IMPL_LINK_NOARG( DropDownEditControl, ReturnHdl, FloatingWindow*, void) { OUString aStr = m_pFloatingEdit->getEdit().GetText(); OUString aStr2 = GetText(); @@ -1313,7 +1313,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( DropDownEditControl, DropDownHdl, Button*, void ) + IMPL_LINK_NOARG( DropDownEditControl, DropDownHdl, Button*, void ) { ShowDropDown(!m_bDropdown); } diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 5da40afbb358..ab026d6e2ec4 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -62,7 +62,7 @@ namespace pcr void SetModifyHdl( const Link<ListBox&,void>& _rLink ) { aModifyHdl = _rLink;; } private: - DECL_LINK_TYPED(OnSelect, ListBox&, void); + DECL_LINK(OnSelect, ListBox&, void); Link<ListBox&,void> aModifyHdl; }; @@ -196,7 +196,7 @@ namespace pcr virtual void SAL_CALL disposing() override; protected: - DECL_LINK_TYPED( OnHyperlinkClicked, void*, void ); + DECL_LINK( OnHyperlinkClicked, void*, void ); }; @@ -335,7 +335,7 @@ namespace pcr virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (css::uno::RuntimeException, std::exception) override; protected: - DECL_LINK_TYPED( OnEntrySelected, ComboBox&, void ); + DECL_LINK( OnEntrySelected, ComboBox&, void ); }; @@ -387,8 +387,8 @@ namespace pcr long FindPos(long nSinglePos); private: - DECL_LINK_TYPED( ReturnHdl, FloatingWindow*, void ); - DECL_LINK_TYPED( DropDownHdl, Button*, void ); + DECL_LINK( ReturnHdl, FloatingWindow*, void ); + DECL_LINK( DropDownHdl, Button*, void ); void ShowDropDown( bool bShow ); }; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 0880464a2616..225c74629556 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -224,19 +224,19 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( TabOrderDialog, MoveUpClickHdl, Button*, void ) + IMPL_LINK_NOARG( TabOrderDialog, MoveUpClickHdl, Button*, void ) { m_pLB_Controls->MoveSelection( -1 ); } - IMPL_LINK_NOARG_TYPED( TabOrderDialog, MoveDownClickHdl, Button*, void ) + IMPL_LINK_NOARG( TabOrderDialog, MoveDownClickHdl, Button*, void ) { m_pLB_Controls->MoveSelection( 1 ); } - IMPL_LINK_NOARG_TYPED( TabOrderDialog, AutoOrderClickHdl, Button*, void ) + IMPL_LINK_NOARG( TabOrderDialog, AutoOrderClickHdl, Button*, void ) { try { @@ -258,7 +258,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( TabOrderDialog, OKClickHdl, Button*, void ) + IMPL_LINK_NOARG( TabOrderDialog, OKClickHdl, Button*, void ) { sal_uLong nEntryCount = m_pLB_Controls->GetEntryCount(); Sequence< Reference< XControlModel > > aSortedControlModelSeq( nEntryCount ); diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index cd6963a609c2..4e351568b4eb 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -81,10 +81,10 @@ namespace pcr ImageList* pImageList; - DECL_LINK_TYPED( MoveUpClickHdl, Button*, void ); - DECL_LINK_TYPED( MoveDownClickHdl, Button*, void ); - DECL_LINK_TYPED( AutoOrderClickHdl, Button*, void ); - DECL_LINK_TYPED( OKClickHdl, Button*, void ); + DECL_LINK( MoveUpClickHdl, Button*, void ); + DECL_LINK( MoveDownClickHdl, Button*, void ); + DECL_LINK( AutoOrderClickHdl, Button*, void ); + DECL_LINK( OKClickHdl, Button*, void ); void FillList(); Image GetImage( diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index e18281d78768..7c9e2f277f78 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -330,7 +330,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( OTimeDurationControl, OnCustomConvert, MetricFormatter&, void ) + IMPL_LINK_NOARG( OTimeDurationControl, OnCustomConvert, MetricFormatter&, void ) { long nMultiplier = 1; if ( getTypedControlWindow()->GetCurUnitText().equalsIgnoreAsciiCase( "ms" ) ) diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 973e99e926c7..d45876434c68 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -152,7 +152,7 @@ namespace pcr ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) override; private: - DECL_LINK_TYPED( OnCustomConvert, MetricFormatter&, void ); + DECL_LINK( OnCustomConvert, MetricFormatter&, void ); }; diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index c0687e369104..6a1cb1b5a9ad 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -699,7 +699,7 @@ void GridWindow::ChangeMode(int nType) Invalidate(); } -IMPL_LINK_TYPED( GridDialog, ClickButtonHdl, Button*, pButton, void ) +IMPL_LINK( GridDialog, ClickButtonHdl, Button*, pButton, void ) { if (pButton == m_pResetButton) { diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index 146e06b98344..73effc64143b 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.hxx @@ -44,7 +44,7 @@ class GridDialog : public ModalDialog VclPtr<GridWindow> m_pGridWindow; - DECL_LINK_TYPED( ClickButtonHdl, Button*, void ); + DECL_LINK( ClickButtonHdl, Button*, void ); public: GridDialog(double* pXValues, double* pYValues, int nValues, diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 1f9bd5d27c65..80cdbdadd379 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -603,7 +603,7 @@ void SaneDlg::InitFields() } } -IMPL_LINK_TYPED( SaneDlg, ClickBtnHdl, Button*, pButton, void ) +IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton, void ) { if( mrSane.IsOpen() ) { @@ -677,7 +677,7 @@ IMPL_LINK_TYPED( SaneDlg, ClickBtnHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( SaneDlg, SelectHdl, ListBox&, rListBox, void ) +IMPL_LINK( SaneDlg, SelectHdl, ListBox&, rListBox, void ) { if( &rListBox == mpDeviceBox && Sane::IsSane() && Sane::CountDevices() ) { @@ -707,7 +707,7 @@ IMPL_LINK_TYPED( SaneDlg, SelectHdl, ListBox&, rListBox, void ) } } -IMPL_LINK_TYPED( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox, void ) +IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox, void ) { if( pBox == mpOptionBox && Sane::IsSane() ) { @@ -775,7 +775,7 @@ IMPL_LINK_TYPED( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox, void ) } } -IMPL_LINK_TYPED( SaneDlg, ModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SaneDlg, ModifyHdl, Edit&, rEdit, void ) { if( mrSane.IsOpen() ) { @@ -867,7 +867,7 @@ IMPL_LINK_TYPED( SaneDlg, ModifyHdl, Edit&, rEdit, void ) } } -IMPL_LINK_NOARG_TYPED( SaneDlg, ReloadSaneOptionsHdl, Sane&, void ) +IMPL_LINK_NOARG( SaneDlg, ReloadSaneOptionsHdl, Sane&, void ) { mnCurrentOption = -1; mnCurrentElement = 0; diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index 7044b5f13e21..555ffb9a33ee 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -80,11 +80,11 @@ private: bool doScan; - DECL_LINK_TYPED( ClickBtnHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ReloadSaneOptionsHdl, Sane&, void ); - DECL_LINK_TYPED( OptionsBoxSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ClickBtnHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( ReloadSaneOptionsHdl, Sane&, void ); + DECL_LINK( OptionsBoxSelectHdl, SvTreeListBox*, void ); void SaveState(); bool LoadState(); diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 7075f7632e3d..558c45e0406b 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -105,8 +105,8 @@ class ImpTwain : public ::cppu::WeakImplHelper< util::XCloseListener > uno::Reference< frame::XFrame > ImplGetActiveFrame(); uno::Reference< util::XCloseBroadcaster > ImplGetActiveFrameCloseBroadcaster(); - DECL_LINK_TYPED( ImplFallbackHdl, void*, void ); - DECL_LINK_TYPED( ImplDestroyHdl, void*, void ); + DECL_LINK( ImplFallbackHdl, void*, void ); + DECL_LINK( ImplDestroyHdl, void*, void ); // from util::XCloseListener virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException); @@ -425,7 +425,7 @@ void ImpTwain::ImplFallback( ULONG_PTR nEvent ) Application::PostUserEvent( LINK( this, ImpTwain, ImplFallbackHdl ), (void*) nEvent ); } -IMPL_LINK_TYPED( ImpTwain, ImplFallbackHdl, void*, pData, void ) +IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData, void ) { const sal_uIntPtr nEvent = (sal_uIntPtr) pData; bool bFallback = true; @@ -495,7 +495,7 @@ IMPL_LINK_TYPED( ImpTwain, ImplFallbackHdl, void*, pData, void ) ImplFallback( nEvent ); } -IMPL_LINK_NOARG_TYPED( ImpTwain, ImplDestroyHdl, void*, void ) +IMPL_LINK_NOARG( ImpTwain, ImplDestroyHdl, void*, void ) { if( hTwainWnd ) DestroyWindow( hTwainWnd ); @@ -641,7 +641,7 @@ class Twain ImpTwain* mpImpTwain; TwainState meState; - DECL_LINK_TYPED( ImpNotifyHdl, unsigned long, void ); + DECL_LINK( ImpNotifyHdl, unsigned long, void ); public: @@ -708,7 +708,7 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X return bRet; } -IMPL_LINK_TYPED( Twain, ImpNotifyHdl, unsigned long, nEvent, void ) +IMPL_LINK( Twain, ImpNotifyHdl, unsigned long, nEvent, void ) { switch( nEvent ) { diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 7fb23d197b44..6973b657781f 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -139,13 +139,13 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper sal_uInt16 mnIconID; private: - DECL_LINK_TYPED(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool); - DECL_LINK_TYPED(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool); - DECL_LINK_TYPED(WaitTimeOutHdl, Idle *, void); - DECL_LINK_TYPED(TimeOutHdl, Timer *, void); - DECL_LINK_TYPED(UserEventHdl, void *, void); - DECL_LINK_TYPED(WindowEventHdl, VclWindowEvent&, void); - DECL_LINK_TYPED(ApplicationEventHdl, VclSimpleEvent&, void); + DECL_LINK(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool); + DECL_LINK(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool); + DECL_LINK(WaitTimeOutHdl, Idle *, void); + DECL_LINK(TimeOutHdl, Timer *, void); + DECL_LINK(UserEventHdl, void *, void); + DECL_LINK(WindowEventHdl, VclWindowEvent&, void); + DECL_LINK(ApplicationEventHdl, VclSimpleEvent&, void); BubbleWindow* GetBubbleWindow(); void RemoveBubbleWindow( bool bRemoveIcon ); @@ -571,7 +571,7 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon ) } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool) +IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool) { SolarMutexGuard aGuard; @@ -594,7 +594,7 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg } -IMPL_LINK_TYPED( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, rData, bool ) +IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, rData, bool ) { if ( rData.bHighlight ) maWaitIdle.Start(); @@ -605,7 +605,7 @@ IMPL_LINK_TYPED( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg& } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, WaitTimeOutHdl, Idle *, void) +IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl, Idle *, void) { SolarMutexGuard aGuard; @@ -618,13 +618,13 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, WaitTimeOutHdl, Idle *, void) } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, TimeOutHdl, Timer *, void) +IMPL_LINK_NOARG(UpdateCheckUI, TimeOutHdl, Timer *, void) { RemoveBubbleWindow( false ); } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, UserEventHdl, void*, void) +IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl, void*, void) { SolarMutexGuard aGuard; @@ -655,7 +655,7 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, UserEventHdl, void*, void) } -IMPL_LINK_TYPED( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) +IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) { sal_uLong nEventID = rEvent.GetId(); @@ -705,7 +705,7 @@ IMPL_LINK_TYPED( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) } -IMPL_LINK_TYPED( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) +IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) { switch (rEvent.GetId()) { |