diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
| commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
| tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /sfx2 | |
| parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) | |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'sfx2')
77 files changed, 278 insertions, 278 deletions
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index d96b33e882d5..71c3e5b1b67b 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -34,8 +34,8 @@ private: SvtURLBox* GetURLBox() const; void OpenURL( const OUString& rName, bool bNew ) const; - DECL_LINK_TYPED( OpenHdl, SvtURLBox*, void ); - DECL_LINK_TYPED( SelectHdl, ComboBox&, void ); + DECL_LINK( OpenHdl, SvtURLBox*, void ); + DECL_LINK( SelectHdl, ComboBox&, void ); struct ExecuteInfo { @@ -44,7 +44,7 @@ private: css::uno::Sequence< css::beans::PropertyValue > aArgs; }; - DECL_STATIC_LINK_TYPED( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, void ); public: diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 5152b8e2d952..0210ed23436b 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -53,7 +53,7 @@ private: void LoadConfig(); void SaveConfig(); - DECL_LINK_TYPED(FindHdl, Button *, void); + DECL_LINK(FindHdl, Button *, void); public: SearchDialog( vcl::Window* pWindow, const OUString& rConfigName ); diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index be3bd16731dc..0b65b948abdd 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -467,7 +467,7 @@ extern "C" void basicide_macro_organizer(sal_Int16); #endif -IMPL_LINK_TYPED( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic, bool ) +IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic, bool ) { #if !HAVE_FEATURE_SCRIPTING (void) pStarBasic; diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 7b47221cfec4..4b4a394c2bc2 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -89,7 +89,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; explicit SfxEventAsyncer_Impl(const SfxEventHint& rHint); virtual ~SfxEventAsyncer_Impl() override; - DECL_LINK_TYPED( IdleHdl, Idle*, void ); + DECL_LINK( IdleHdl, Idle*, void ); }; @@ -121,7 +121,7 @@ SfxEventAsyncer_Impl::~SfxEventAsyncer_Impl() } -IMPL_LINK_TYPED(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle, void) +IMPL_LINK(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle, void) { SfxObjectShellRef xRef( aHint.GetObjShell() ); pAsyncIdle->Stop(); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 14b9aa8b8cf9..5adbc7cad70e 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -275,7 +275,7 @@ namespace class LicenseDialog : public ModalDialog { private: - DECL_LINK_TYPED(ShowHdl, Button*, void); + DECL_LINK(ShowHdl, Button*, void); public: explicit LicenseDialog(); }; @@ -286,7 +286,7 @@ namespace get<PushButton>("show")->SetClickHdl(LINK(this, LicenseDialog, ShowHdl)); } - IMPL_LINK_NOARG_TYPED(LicenseDialog, ShowHdl, Button*, void) + IMPL_LINK_NOARG(LicenseDialog, ShowHdl, Button*, void) { EndDialog(RET_OK); showDocument("LICENSE"); diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 9d3bb975cab4..e7ced1bfa4f9 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -455,7 +455,7 @@ void SvFileObject::Edit( vcl::Window* /*pParent*/, sfx2::SvBaseLink* pLink, cons } } -IMPL_LINK_NOARG_TYPED( SvFileObject, LoadGrfReady_Impl, void*, void ) +IMPL_LINK_NOARG( SvFileObject, LoadGrfReady_Impl, void*, void ) { // When we come form here there it can not be an error no more. bLoadError = false; @@ -486,13 +486,13 @@ IMPL_LINK_NOARG_TYPED( SvFileObject, LoadGrfReady_Impl, void*, void ) } } -IMPL_LINK_NOARG_TYPED( SvFileObject, DelMedium_Impl, void*, void ) +IMPL_LINK_NOARG( SvFileObject, DelMedium_Impl, void*, void ) { nPostUserEventId = nullptr; mxDelMed.Clear(); } -IMPL_LINK_TYPED( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { OUString sFile; diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index 8d8810a0dc4f..1b735e0c4414 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -53,9 +53,9 @@ class SvFileObject : public sfx2::SvLinkSource bool LoadFile_Impl(); void SendStateChg_Impl( sfx2::LinkManager::LinkState nState ); - DECL_LINK_TYPED( DelMedium_Impl, void*, void ); - DECL_LINK_TYPED( LoadGrfReady_Impl, void*, void ); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( DelMedium_Impl, void*, void ); + DECL_LINK( LoadGrfReady_Impl, void*, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); protected: virtual ~SvFileObject() override; diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 52727441489c..2fe0d7e30e05 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -59,7 +59,7 @@ class SvDDELinkEditDialog : public ModalDialog VclPtr<Edit> m_pEdDdeItem; VclPtr<OKButton> m_pOKButton; - DECL_LINK_TYPED( EditHdl_Impl, Edit&, void ); + DECL_LINK( EditHdl_Impl, Edit&, void ); public: SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* ); virtual ~SvDDELinkEditDialog() override; @@ -110,7 +110,7 @@ OUString SvDDELinkEditDialog::GetCmd() const return sRet; } -IMPL_LINK_NOARG_TYPED( SvDDELinkEditDialog, EditHdl_Impl, Edit&, void) +IMPL_LINK_NOARG( SvDDELinkEditDialog, EditHdl_Impl, Edit&, void) { m_pOKButton->Enable( !m_pEdDdeApp->GetText().isEmpty() && !m_pEdDdeTopic->GetText().isEmpty() && @@ -313,7 +313,7 @@ bool SvDDEObject::IsDataComplete() const return bWaitForData; } -IMPL_LINK_TYPED( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void ) +IMPL_LINK( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void ) { SotClipboardFormatId nFmt = pData->GetFormat(); switch( nFmt ) @@ -347,7 +347,7 @@ IMPL_LINK_TYPED( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void ) } } -IMPL_LINK_TYPED( SvDDEObject, ImplDoneDDEData, bool, bValid, void ) +IMPL_LINK( SvDDEObject, ImplDoneDDEData, bool, bValid, void ) { if( !bValid && ( pRequest || pLink )) { diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx index 1888246c4194..5c2bc3a014c4 100644 --- a/sfx2/source/appl/impldde.hxx +++ b/sfx2/source/appl/impldde.hxx @@ -44,8 +44,8 @@ class SvDDEObject : public SvLinkSource static bool ImplHasOtherFormat( DdeTransaction& ); - DECL_LINK_TYPED( ImplGetDDEData, const DdeData*, void ); - DECL_LINK_TYPED( ImplDoneDDEData, bool, void ); + DECL_LINK( ImplGetDDEData, const DdeData*, void ); + DECL_LINK( ImplDoneDDEData, bool, void ); protected: virtual ~SvDDEObject() override; diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 2d4907d58bdd..d09823a74625 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -235,7 +235,7 @@ SvBaseLink::~SvBaseLink() delete pImplData; } -IMPL_LINK_TYPED( SvBaseLink, EndEditHdl, const OUString&, _rNewName, void ) +IMPL_LINK( SvBaseLink, EndEditHdl, const OUString&, _rNewName, void ) { OUString sNewName = _rNewName; if ( !ExecuteEdit( sNewName ) ) diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 575ea7174d93..0242633f5658 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -720,18 +720,18 @@ void IndexTabPage_Impl::ClearIndex() m_pIndexCB->Clear(); } -IMPL_LINK_NOARG_TYPED(IndexTabPage_Impl, OpenHdl, Button*, void) +IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl, Button*, void) { m_pIndexCB->GetDoubleClickHdl().Call(*m_pIndexCB); } -IMPL_LINK_TYPED( IndexTabPage_Impl, IdleHdl, Idle*, pIdle, void ) +IMPL_LINK( IndexTabPage_Impl, IdleHdl, Idle*, pIdle, void ) { if ( &aFactoryIdle == pIdle ) InitializeIndex(); } -IMPL_LINK_TYPED( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer, void) +IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer, void) { if(&aKeywordTimer == pTimer && !sKeyword.isEmpty()) aKeywordLink.Call(*this); @@ -1016,12 +1016,12 @@ void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText ) } -IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, ClickHdl, Button*, void) +IMPL_LINK_NOARG(SearchTabPage_Impl, ClickHdl, Button*, void) { SearchHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, SearchHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl, LinkParamNone*, void) { OUString aSearchText = comphelper::string::strip(m_pSearchED->GetText(), ' '); if ( !aSearchText.isEmpty() ) @@ -1058,12 +1058,12 @@ IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, SearchHdl, LinkParamNone*, void) } } -IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, OpenHdl, Button*, void) +IMPL_LINK_NOARG(SearchTabPage_Impl, OpenHdl, Button*, void) { m_pResultsLB->GetDoubleClickHdl().Call(*m_pResultsLB); } -IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SearchTabPage_Impl, ModifyHdl, Edit&, void) { OUString aSearchText = comphelper::string::strip(m_pSearchED->GetText(), ' '); m_pSearchBtn->Enable(!aSearchText.isEmpty()); @@ -1302,7 +1302,7 @@ void BookmarksTabPage_Impl::dispose() } -IMPL_LINK_NOARG_TYPED(BookmarksTabPage_Impl, OpenHdl, Button*, void) +IMPL_LINK_NOARG(BookmarksTabPage_Impl, OpenHdl, Button*, void) { m_pBookmarksBox->GetDoubleClickHdl().Call(*m_pBookmarksBox); } @@ -1544,19 +1544,19 @@ HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId ) return pPage; } -IMPL_LINK_TYPED( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl, void ) +IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl, void ) { sal_uInt16 nId = 0; TabPage* pPage = GetCurrentPage( nId ); pTabCtrl->SetTabPage( nId, pPage ); } -IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectHdl, ListBox&, void) { aIdle.Start(); } -IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, InitHdl, Idle *, void) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl, Idle *, void) { bIsInitDone = true; Initialize(); @@ -1566,7 +1566,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, InitHdl, Idle *, void) aIdle.SetPriority( SchedulerPriority::LOWEST ); } -IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Idle *, void) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Idle *, void) { OUString* pFactory = static_cast<OUString*>(m_pActiveLB->GetSelectEntryData()); if ( pFactory ) @@ -1576,7 +1576,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl&, void) +IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl&, void) { // keyword found on index? bool bIndex = pIPage->HasKeyword(); @@ -1598,7 +1598,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl&, v pParentWin->ShowStartPage(); } -IMPL_LINK_TYPED(SfxHelpIndexWindow_Impl, IndexTabPageDoubleClickHdl, ComboBox&, rBox, void) +IMPL_LINK(SfxHelpIndexWindow_Impl, IndexTabPageDoubleClickHdl, ComboBox&, rBox, void) { aPageDoubleClickLink.Call(&rBox); } @@ -1689,12 +1689,12 @@ void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link<Control*,bool>& rLin aPageDoubleClickLink = rLink; } -IMPL_LINK_TYPED(SfxHelpIndexWindow_Impl, ContentTabPageDoubleClickHdl, SvTreeListBox*, p, bool) +IMPL_LINK(SfxHelpIndexWindow_Impl, ContentTabPageDoubleClickHdl, SvTreeListBox*, p, bool) { return aPageDoubleClickLink.Call(p); } -IMPL_LINK_TYPED(SfxHelpIndexWindow_Impl, TabPageDoubleClickHdl, ListBox&, r, void) +IMPL_LINK(SfxHelpIndexWindow_Impl, TabPageDoubleClickHdl, ListBox&, r, void) { aPageDoubleClickLink.Call(&r); } @@ -2154,7 +2154,7 @@ bool SfxHelpTextWindow_Impl::isHandledKey( const vcl::KeyCode& _rKeyCode ) } -IMPL_LINK_NOARG_TYPED(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void) +IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void) { try { @@ -2192,7 +2192,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void) } -IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void ) { InitToolBoxImages(); Resize(); @@ -2200,7 +2200,7 @@ IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void ) } -IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog&, rDlg, void ) +IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog&, rDlg, void ) { FindHdl(&rDlg); } @@ -2283,13 +2283,13 @@ void SfxHelpTextWindow_Impl::FindHdl(sfx2::SearchDialog* pDlg) } -IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, void ) +IMPL_LINK_NOARG( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, void ) { pSrchDlg.clear(); } -IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, CheckHdl, Button*, pButton, void ) +IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if ( xConfiguration.is() ) @@ -2804,7 +2804,7 @@ void SfxHelpWindow_Impl::ShowStartPage() } -IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) +IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) { if ( pToolBox ) { @@ -2814,7 +2814,7 @@ IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) } -IMPL_LINK_NOARG_TYPED(SfxHelpWindow_Impl, OpenHdl, Control*, bool) +IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl, Control*, bool) { pIndexWin->SelectExecutableEntry(); OUString aEntry = pIndexWin->GetSelectEntry(); @@ -2854,7 +2854,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpWindow_Impl, OpenHdl, Control*, bool) } -IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin, void ) +IMPL_LINK( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin, void ) { if ( sTitle.isEmpty() ) sTitle = GetParent()->GetText(); @@ -2871,7 +2871,7 @@ IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* } -IMPL_LINK_TYPED( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl&, rListener, void ) +IMPL_LINK( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl&, rListener, void ) { SetFactory( rListener.GetFactory() ); } diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 29efc2113de4..a5d7e67dd574 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -137,9 +137,9 @@ private: void InitializeIndex(); void ClearIndex(); - DECL_LINK_TYPED(OpenHdl, Button*, void); - DECL_LINK_TYPED(IdleHdl, Idle*, void); - DECL_LINK_TYPED(TimeoutHdl, Timer*, void); + DECL_LINK(OpenHdl, Button*, void); + DECL_LINK(IdleHdl, Idle*, void); + DECL_LINK(TimeoutHdl, Timer*, void); public: IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); @@ -214,10 +214,10 @@ private: void ClearSearchResults(); void RememberSearchText( const OUString& rSearchText ); - DECL_LINK_TYPED(SearchHdl, LinkParamNone*, void); - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(OpenHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(SearchHdl, LinkParamNone*, void); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(OpenHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SearchTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); @@ -259,7 +259,7 @@ private: VclPtr<BookmarksBox_Impl> m_pBookmarksBox; VclPtr<PushButton> m_pBookmarksPB; - DECL_LINK_TYPED(OpenHdl, Button*, void); + DECL_LINK(OpenHdl, Button*, void); public: BookmarksTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); @@ -312,14 +312,14 @@ private: inline SearchTabPage_Impl* GetSearchPage(); inline BookmarksTabPage_Impl* GetBookmarksPage(); - DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void ); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK_TYPED(InitHdl, Idle *, void); - DECL_LINK_TYPED(SelectFactoryHdl, Idle *, void); - DECL_LINK_TYPED(KeywordHdl, IndexTabPage_Impl&, void); - DECL_LINK_TYPED(ContentTabPageDoubleClickHdl, SvTreeListBox*, bool); - DECL_LINK_TYPED(TabPageDoubleClickHdl, ListBox&, void); - DECL_LINK_TYPED(IndexTabPageDoubleClickHdl, ComboBox&, void); + DECL_LINK(ActivatePageHdl, TabControl*, void ); + DECL_LINK(SelectHdl, ListBox&, void); + DECL_LINK(InitHdl, Idle *, void); + DECL_LINK(SelectFactoryHdl, Idle *, void); + DECL_LINK(KeywordHdl, IndexTabPage_Impl&, void); + DECL_LINK(ContentTabPageDoubleClickHdl, SvTreeListBox*, bool); + DECL_LINK(TabPageDoubleClickHdl, ListBox&, void); + DECL_LINK(IndexTabPageDoubleClickHdl, ComboBox&, void); public: explicit SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent ); @@ -453,11 +453,11 @@ private: getCursor() const; bool isHandledKey( const vcl::KeyCode& _rKeyCode ); - DECL_LINK_TYPED( SelectHdl, Idle *, void); - DECL_LINK_TYPED( NotifyHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( FindHdl, sfx2::SearchDialog&, void ); - DECL_LINK_TYPED( CloseHdl, sfx2::SearchDialog*, void ); - DECL_LINK_TYPED( CheckHdl, Button*, void ); + DECL_LINK( SelectHdl, Idle *, void); + DECL_LINK( NotifyHdl, LinkParamNone*, void ); + DECL_LINK( FindHdl, sfx2::SearchDialog&, void ); + DECL_LINK( CloseHdl, sfx2::SearchDialog*, void ); + DECL_LINK( CheckHdl, Button*, void ); void FindHdl(sfx2::SearchDialog*); public: @@ -521,10 +521,10 @@ friend class SfxHelpIndexWindow_Impl; void SaveConfig(); void ShowStartPage(); - DECL_LINK_TYPED( SelectHdl, ToolBox*, void ); - DECL_LINK_TYPED( OpenHdl, Control*, bool ); - DECL_LINK_TYPED( SelectFactoryHdl, SfxHelpIndexWindow_Impl*, void ); - DECL_LINK_TYPED( ChangeHdl, HelpListener_Impl&, void ); + DECL_LINK( SelectHdl, ToolBox*, void ); + DECL_LINK( OpenHdl, Control*, bool ); + DECL_LINK( SelectFactoryHdl, SfxHelpIndexWindow_Impl*, void ); + DECL_LINK( ChangeHdl, HelpListener_Impl&, void ); public: SfxHelpWindow_Impl( const css::uno::Reference < css::frame::XFrame2 >& rFrame, diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index a0acb4984961..86aa57c74d7a 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -351,7 +351,7 @@ void ShutdownIcon::StartFileDialog() } -IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused*/, void ) +IMPL_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused*/, void ) { DBG_ASSERT( m_pFileDlg, "ShutdownIcon, DialogClosedHdl_Impl(): no file dialog" ); diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index cefeebb4b98f..d90792751716 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -114,7 +114,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase void SetVeto( bool bVeto ) { m_bVeto = bVeto;} void StartFileDialog(); - DECL_LINK_TYPED(DialogClosedHdl_Impl, sfx2::FileDialogHelper*, void); + DECL_LINK(DialogClosedHdl_Impl, sfx2::FileDialogHelper*, void); static bool IsQuickstarterInstalled(); diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index e58ac1090a4a..a85c95fcf596 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -816,7 +816,7 @@ std::shared_ptr<const SfxFilter> SfxFilterMatcher::GetFilter4FilterName( const O return nullptr; } -IMPL_LINK_TYPED( SfxFilterMatcher, MaybeFileHdl_Impl, OUString*, pString, bool ) +IMPL_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, OUString*, pString, bool ) { std::shared_ptr<const SfxFilter> pFilter = GetFilter4Extension( *pString ); if (pFilter && !pFilter->GetWildcard().Matches( OUString() ) && diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 61d1630ccca2..c418d0795445 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1436,7 +1436,7 @@ void SfxBindings::UpdateControllers_Impl } } -IMPL_LINK_TYPED( SfxBindings, NextJob, Timer *, pTimer, void ) +IMPL_LINK( SfxBindings, NextJob, Timer *, pTimer, void ) { NextJob_Impl(pTimer); } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 4b57f14956fe..9aee901870cd 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -611,7 +611,7 @@ void SfxDispatcher::Pop(SfxShell& rShell, SfxDispatcherPopFlags nMode) It flushes the Stack, if it is dirty, thus it actually executes the pending Push and Pop commands. */ -IMPL_LINK_NOARG_TYPED( SfxDispatcher, EventHdl_Impl, Idle *, void ) +IMPL_LINK_NOARG( SfxDispatcher, EventHdl_Impl, Idle *, void ) { Flush(); Update_Impl(); @@ -1174,7 +1174,7 @@ const SfxPoolItem* SfxDispatcher::ExecuteList(sal_uInt16 nSlot, SfxCallMode eCal /** Helper method to receive the asynchronously executed <SfxRequest>s. */ -IMPL_LINK_TYPED(SfxDispatcher, PostMsgHandler, SfxRequest*, pReq, void) +IMPL_LINK(SfxDispatcher, PostMsgHandler, SfxRequest*, pReq, void) { DBG_ASSERT( !xImp->bFlushing, "recursive call to dispatcher" ); SFX_STACK(SfxDispatcher::PostMsgHandler); diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx index 79bda2b639d3..dc66b1fbecd7 100644 --- a/sfx2/source/control/emojicontrol.cxx +++ b/sfx2/source/control/emojicontrol.cxx @@ -148,12 +148,12 @@ FILTER_CATEGORY SfxEmojiControl::getCurrentFilter() return FILTER_CATEGORY::PEOPLE; } -IMPL_LINK_NOARG_TYPED(SfxEmojiControl, ActivatePageHdl, TabControl*, void) +IMPL_LINK_NOARG(SfxEmojiControl, ActivatePageHdl, TabControl*, void) { mpEmojiView->filterItems(ViewFilter_Category(getCurrentFilter())); } -IMPL_STATIC_LINK_TYPED(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, pItem, void) +IMPL_STATIC_LINK(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, pItem, void) { OUStringBuffer sHexText = ""; sHexText.appendUtf32(OUString(pItem->getTitle()).toUInt32(16)); diff --git a/sfx2/source/control/itemdel.cxx b/sfx2/source/control/itemdel.cxx index 096ab3752864..a1d6478a45fd 100644 --- a/sfx2/source/control/itemdel.cxx +++ b/sfx2/source/control/itemdel.cxx @@ -30,7 +30,7 @@ class SfxItemDisruptor_Impl Idle m_Idle; private: - DECL_LINK_TYPED( Delete, Idle*, void ); + DECL_LINK( Delete, Idle*, void ); public: explicit SfxItemDisruptor_Impl(SfxPoolItem *pItemToDesrupt); @@ -66,7 +66,7 @@ SfxItemDisruptor_Impl::~SfxItemDisruptor_Impl() delete pItem; } -IMPL_LINK_NOARG_TYPED(SfxItemDisruptor_Impl, Delete, Idle*, void) +IMPL_LINK_NOARG(SfxItemDisruptor_Impl, Delete, Idle*, void) { delete this; } diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 8dfa4e545669..e58003efb844 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -324,7 +324,7 @@ void RecentDocsView::Clear() ThumbnailView::Clear(); } -IMPL_STATIC_LINK_TYPED( RecentDocsView, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, void*, p, void ) { LoadRecentFile* pLoadRecentFile = static_cast< LoadRecentFile*>(p); try diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx index 1f6917735d56..5e2d0fcf00eb 100644 --- a/sfx2/source/control/templatedefaultview.cxx +++ b/sfx2/source/control/templatedefaultview.cxx @@ -73,7 +73,7 @@ void TemplateDefaultView::createContextMenu() Invalidate(); } -IMPL_LINK_TYPED(TemplateDefaultView, ContextMenuSelectHdl, Menu*, pMenu, void) +IMPL_LINK(TemplateDefaultView, ContextMenuSelectHdl, Menu*, pMenu, void) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 758ce118bac2..f60a4803a78c 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -254,7 +254,7 @@ void TemplateLocalView::createContextMenu(const bool bIsDefault) Invalidate(); } -IMPL_LINK_TYPED(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx index 1f3fc76ee469..e1db4e53c65f 100644 --- a/sfx2/source/control/templatesearchview.cxx +++ b/sfx2/source/control/templatesearchview.cxx @@ -144,7 +144,7 @@ void TemplateSearchView::createContextMenu( const bool bIsDefault) Invalidate(); } -IMPL_LINK_TYPED(TemplateSearchView, ContextMenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK(TemplateSearchView, ContextMenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 716883c47825..68e88bae79cc 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -493,7 +493,7 @@ bool ThumbnailView::ImplHasAccessibleListeners() return( pAcc && pAcc->HasAccessibleListeners() ); } -IMPL_LINK_TYPED( ThumbnailView,ImplScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( ThumbnailView,ImplScrollHdl, ScrollBar*, pScrollBar, void ) { if ( pScrollBar->GetDelta() ) { diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index dfa98d72c443..d022c2e02e55 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -522,7 +522,7 @@ void BackingWindow::Resize() Invalidate(); } -IMPL_LINK_TYPED(BackingWindow, ExtLinkClickHdl, Button*, pButton, void) +IMPL_LINK(BackingWindow, ExtLinkClickHdl, Button*, pButton, void) { OUString aNode; @@ -561,7 +561,7 @@ IMPL_LINK_TYPED(BackingWindow, ExtLinkClickHdl, Button*, pButton, void) } } -IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, void ) +IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton, void ) { // dispatch the appropriate URL and end the dialog if( pButton == mpWriterAllButton ) @@ -618,7 +618,7 @@ IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( BackingWindow, MenuSelectHdl, MenuButton*, pButton, void ) +IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, pButton, void ) { if(pButton == mpRecentButton) { @@ -663,7 +663,7 @@ IMPL_LINK_TYPED( BackingWindow, MenuSelectHdl, MenuButton*, pButton, void ) } } -IMPL_LINK_TYPED(BackingWindow, CreateContextMenuHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(BackingWindow, CreateContextMenuHdl, ThumbnailViewItem*, pItem, void) { const TemplateViewItem *pViewItem = dynamic_cast<TemplateViewItem*>(pItem); @@ -671,7 +671,7 @@ IMPL_LINK_TYPED(BackingWindow, CreateContextMenuHdl, ThumbnailViewItem*, pItem, mpLocalView->createContextMenu(); } -IMPL_LINK_TYPED(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) { uno::Sequence< PropertyValue > aArgs(4); aArgs[0].Name = "AsTemplate"; @@ -696,7 +696,7 @@ IMPL_LINK_TYPED(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) } } -IMPL_LINK_TYPED(BackingWindow, EditTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(BackingWindow, EditTemplateHdl, ThumbnailViewItem*, pItem, void) { uno::Sequence< PropertyValue > aArgs(3); aArgs[0].Name = "AsTemplate"; diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 7fe9369e8c43..2469409cc483 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -100,12 +100,12 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer const css::uno::Reference<css::frame::XDispatchProvider >& i_xProv = css::uno::Reference<css::frame::XDispatchProvider>(), const css::uno::Sequence<css::beans::PropertyValue >& = css::uno::Sequence<css::beans::PropertyValue>()); - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(MenuSelectHdl, MenuButton*, void); - DECL_LINK_TYPED(ExtLinkClickHdl, Button*, void); - DECL_LINK_TYPED(CreateContextMenuHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(EditTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(MenuSelectHdl, MenuButton*, void); + DECL_LINK(ExtLinkClickHdl, Button*, void); + DECL_LINK(CreateContextMenuHdl, ThumbnailViewItem*, void); + DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(EditTemplateHdl, ThumbnailViewItem*, void); void initControls(); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 953e8da4d6eb..971c7502f4bb 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -281,7 +281,7 @@ void SfxModelessDialog::Move() Implements a timer event that is triggered by a move or resize of the window This will save config information to Views.xcu with a small delay */ -IMPL_LINK_NOARG_TYPED(SfxModelessDialog, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl, Idle *, void) { pImpl->aMoveIdle.Stop(); if ( pImpl->bConstructed && pImpl->pMgr ) @@ -534,7 +534,7 @@ void SfxFloatingWindow::Move() Implements a timer event that is triggered by a move or resize of the window This will save config information to Views.xcu with a small delay */ -IMPL_LINK_NOARG_TYPED(SfxFloatingWindow, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl, Idle *, void) { pImpl->aMoveIdle.Stop(); if ( pImpl->bConstructed && pImpl->pMgr ) @@ -598,7 +598,7 @@ void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const // SfxSingleTabDialog ---------------------------------------------------- -IMPL_LINK_NOARG_TYPED(SfxSingleTabDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl, Button*, void) /* [Description] diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx index c6e10ccec20e..7998ea9a6819 100644 --- a/sfx2/source/dialog/checkin.cxx +++ b/sfx2/source/dialog/checkin.cxx @@ -43,7 +43,7 @@ bool SfxCheckinDialog::IsMajor( ) return m_pMajorCB->IsChecked( ); } -IMPL_LINK_NOARG_TYPED( SfxCheckinDialog, OKHdl, Button*, void ) +IMPL_LINK_NOARG( SfxCheckinDialog, OKHdl, Button*, void ) { EndDialog( RET_OK ); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index b074dc05e17d..6164b5edbb83 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -828,7 +828,7 @@ void SfxDocumentPage::dispose() } -IMPL_LINK_NOARG_TYPED(SfxDocumentPage, DeleteHdl, Button*, void) +IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl, Button*, void) { OUString aName; if ( bEnableUseUserData && m_pUseUserDataCB->IsChecked() ) @@ -845,7 +845,7 @@ IMPL_LINK_NOARG_TYPED(SfxDocumentPage, DeleteHdl, Button*, void) bHandleDelete = true; } -IMPL_LINK_NOARG_TYPED(SfxDocumentPage, SignatureHdl, Button*, void) +IMPL_LINK_NOARG(SfxDocumentPage, SignatureHdl, Button*, void) { SfxObjectShell* pDoc = SfxObjectShell::Current(); if( pDoc ) @@ -856,7 +856,7 @@ IMPL_LINK_NOARG_TYPED(SfxDocumentPage, SignatureHdl, Button*, void) } } -IMPL_STATIC_LINK_NOARG_TYPED(SfxDocumentPage, ChangePassHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SfxDocumentPage, ChangePassHdl, Button*, void) { SfxObjectShell* pShell = SfxObjectShell::Current(); do @@ -1377,7 +1377,7 @@ CustomPropertiesEditButton::CustomPropertiesEditButton(vcl::Window* pParent, Win SetClickHdl( LINK( this, CustomPropertiesEditButton, ClickHdl )); } -IMPL_LINK_NOARG_TYPED(CustomPropertiesEditButton, ClickHdl, Button*, void) +IMPL_LINK_NOARG(CustomPropertiesEditButton, ClickHdl, Button*, void) { VclPtrInstance< DurationDialog_Impl > pDurationDlg( this, m_pLine->m_aDurationField->GetDuration() ); if ( RET_OK == pDurationDlg->Execute() ) @@ -1525,7 +1525,7 @@ void CustomPropertiesWindow::dispose() vcl::Window::dispose(); } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( CustomPropertiesWindow, TypeHdl, ListBox&, rListBox, void ) { CustomPropertiesTypeBox* pBox = static_cast<CustomPropertiesTypeBox*>(&rListBox); @@ -1553,7 +1553,7 @@ IMPL_STATIC_LINK_TYPED( } } -IMPL_LINK_TYPED( CustomPropertiesWindow, RemoveHdl, Button*, pBtn, void ) +IMPL_LINK( CustomPropertiesWindow, RemoveHdl, Button*, pBtn, void ) { CustomPropertiesRemoveButton* pButton = static_cast<CustomPropertiesRemoveButton*>(pBtn); CustomPropertyLine* pLine = pButton->GetLine(); @@ -1589,7 +1589,7 @@ IMPL_LINK_TYPED( CustomPropertiesWindow, RemoveHdl, Button*, pBtn, void ) m_aRemovedHdl.Call(nullptr); } -IMPL_LINK_TYPED( CustomPropertiesWindow, EditLoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( CustomPropertiesWindow, EditLoseFocusHdl, Control&, rControl, void ) { CustomPropertiesEdit* pEdit = static_cast<CustomPropertiesEdit*>(&rControl); CustomPropertyLine* pLine = pEdit->GetLine(); @@ -1602,18 +1602,18 @@ IMPL_LINK_TYPED( CustomPropertiesWindow, EditLoseFocusHdl, Control&, rControl, v pLine->m_bTypeLostFocus = false; } -IMPL_LINK_TYPED( CustomPropertiesWindow, BoxLoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( CustomPropertiesWindow, BoxLoseFocusHdl, Control&, rControl, void ) { m_pCurrentLine = static_cast<CustomPropertiesTypeBox*>(&rControl)->GetLine(); m_aBoxLoseFocusIdle.Start(); } -IMPL_LINK_NOARG_TYPED(CustomPropertiesWindow, EditTimeoutHdl, Idle *, void) +IMPL_LINK_NOARG(CustomPropertiesWindow, EditTimeoutHdl, Idle *, void) { ValidateLine( m_pCurrentLine, false ); } -IMPL_LINK_NOARG_TYPED(CustomPropertiesWindow, BoxTimeoutHdl, Idle *, void) +IMPL_LINK_NOARG(CustomPropertiesWindow, BoxTimeoutHdl, Idle *, void) { ValidateLine( m_pCurrentLine, true ); } @@ -2148,7 +2148,7 @@ void CustomPropertiesControl::dispose() vcl::Window::dispose(); } -IMPL_LINK_TYPED( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, void ) { sal_Int32 nOffset = m_pPropertiesWin->GetLineHeight(); nOffset *= ( m_nThumbPos - pScrollBar->GetThumbPos() ); @@ -2156,7 +2156,7 @@ IMPL_LINK_TYPED( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, voi m_pPropertiesWin->DoScroll( nOffset ); } -IMPL_LINK_NOARG_TYPED(CustomPropertiesControl, RemovedHdl, void*, void) +IMPL_LINK_NOARG(CustomPropertiesControl, RemovedHdl, void*, void) { long nLineCount = m_pPropertiesWin->GetVisibleLineCount(); m_pVertScroll->SetRangeMax(nLineCount + 1); @@ -2193,7 +2193,7 @@ void SfxCustomPropertiesPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SfxCustomPropertiesPage, AddHdl, Button*, void) +IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl, Button*, void) { Any aAny; m_pPropertiesCtrl->AddLine( OUString(), aAny, true ); @@ -2607,7 +2607,7 @@ void CmisPropertiesControl::ClearAllLines() m_pPropertiesWin.ClearAllLines(); } -IMPL_LINK_TYPED( CmisPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( CmisPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, void ) { sal_Int32 nOffset = m_pPropertiesWin.GetItemHeight(); nOffset *= ( pScrollBar->GetThumbPos() ); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 9fe7b04f0f2d..f74494f1ed7c 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1725,7 +1725,7 @@ void SfxDockingWindow::Move() pImpl->aMoveIdle.Start(); } -IMPL_LINK_NOARG_TYPED(SfxDockingWindow, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(SfxDockingWindow, TimerHdl, Idle *, void) { pImpl->aMoveIdle.Stop(); if ( IsReallyVisible() && IsFloatingMode() ) diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index cf5866e90551..7f379f58cc1d 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -662,7 +662,7 @@ void FileDialogHelper_Impl::updateVersions() } } -IMPL_LINK_NOARG_TYPED(FileDialogHelper_Impl, TimeOutHdl_Impl, Idle *, void) +IMPL_LINK_NOARG(FileDialogHelper_Impl, TimeOutHdl_Impl, Idle *, void) { if ( !mbHasPreview ) return; @@ -1178,7 +1178,7 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con } } -IMPL_LINK_NOARG_TYPED( FileDialogHelper_Impl, InitControls, void*, void ) +IMPL_LINK_NOARG( FileDialogHelper_Impl, InitControls, void*, void ) { mnPostUserEventId = nullptr; enablePasswordBox( true ); @@ -2312,7 +2312,7 @@ void FileDialogHelper::SetContext( Context _eNewContext ) mpImpl->SetContext( _eNewContext ); } -IMPL_LINK_NOARG_TYPED(FileDialogHelper, ExecuteSystemFilePicker, void*, void) +IMPL_LINK_NOARG(FileDialogHelper, ExecuteSystemFilePicker, void*, void) { m_nError = mpImpl->execute(); m_aDialogClosedLink.Call( this ); diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index d3f0a3c793ea..3ddfe25d20ef 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -145,8 +145,8 @@ namespace sfx2 std::vector<OUString>& rpURLList, const std::shared_ptr<const SfxFilter>& pFilter ); - DECL_LINK_TYPED( TimeOutHdl_Impl, Idle *, void); - DECL_LINK_TYPED( InitControls, void*, void ); + DECL_LINK( TimeOutHdl_Impl, Idle *, void); + DECL_LINK( InitControls, void*, void ); public: // XFilePickerListener methods diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index df620f809334..331952ef5cfc 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -256,7 +256,7 @@ void SfxInfoBarWindow::Resize() m_pMessage->SetPosSizePixel(aMessagePosition, aMessageSize); } -IMPL_LINK_NOARG_TYPED(SfxInfoBarWindow, CloseHandler, Button*, void) +IMPL_LINK_NOARG(SfxInfoBarWindow, CloseHandler, Button*, void) { static_cast<SfxInfoBarContainerWindow*>(GetParent())->removeInfoBar(this); } diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx index 427f2862ed5b..cbcbe2d0b98e 100644 --- a/sfx2/source/dialog/inputdlg.cxx +++ b/sfx2/source/dialog/inputdlg.cxx @@ -58,7 +58,7 @@ void InputDialog::SetEntryText( OUString const & sStr) m_pEntry->SetCursorAtLast(); } -IMPL_LINK_TYPED(InputDialog,ClickHdl, Button*, pButton, void) +IMPL_LINK(InputDialog,ClickHdl, Button*, pButton, void) { EndDialog(pButton == m_pOK ? RET_OK : RET_CANCEL); } diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 60476b8ca155..6c8a29f9069c 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -339,7 +339,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() m_pDescFt->SetText( pStyle->GetDescription( eUnit ) ); } -IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox&, void ) { OUString aTemplName(m_pFollowLb->GetSelectEntry()); OUString aEditTemplName(m_pNameRo->GetText()); @@ -349,7 +349,7 @@ IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox m_pEditStyleBtn->Disable(); } -IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void ) { OUString aTemplName(m_pFollowLb->GetSelectEntry()); if (Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily() )) @@ -357,7 +357,7 @@ IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void } } -IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, ListBox&, void ) { sal_Int32 linkSelectPos = m_pBaseLb->GetSelectEntryPos(); if ( linkSelectPos == 0 ) @@ -366,7 +366,7 @@ IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, Lis m_pEditLinkStyleBtn->Enable(); } -IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditLinkStyleHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleHdl_Impl, Button*, void ) { OUString aTemplName(m_pBaseLb->GetSelectEntry()); if (aTemplName != SfxResId(STR_NONE)) @@ -408,7 +408,7 @@ bool SfxManageStyleSheetPage::Execute_Impl( } -IMPL_LINK_TYPED( SfxManageStyleSheetPage, GetFocusHdl, Control&, rControl, void ) +IMPL_LINK( SfxManageStyleSheetPage, GetFocusHdl, Control&, rControl, void ) /* [Description] @@ -420,7 +420,7 @@ IMPL_LINK_TYPED( SfxManageStyleSheetPage, GetFocusHdl, Control&, rControl, void aBuf = comphelper::string::stripStart(pEdit->GetText(), ' '); } -IMPL_LINK_TYPED( SfxManageStyleSheetPage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SfxManageStyleSheetPage, LoseFocusHdl, Control&, rControl, void ) /* [Description] diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index fc0d4f973a80..903a9342e9a0 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -28,11 +28,11 @@ // PRIVATE METHODES ------------------------------------------------------ -IMPL_LINK_NOARG_TYPED( SfxNewStyleDlg, OKClickHdl, Button*, void ) +IMPL_LINK_NOARG( SfxNewStyleDlg, OKClickHdl, Button*, void ) { OKHdl(*m_pColBox); } -IMPL_LINK_NOARG_TYPED( SfxNewStyleDlg, OKHdl, ComboBox&, void ) +IMPL_LINK_NOARG( SfxNewStyleDlg, OKHdl, ComboBox&, void ) { const OUString aName( m_pColBox->GetText() ); SfxStyleSheetBase* pStyle = rPool.Find( aName, rPool.GetSearchFamily() ); @@ -51,7 +51,7 @@ IMPL_LINK_NOARG_TYPED( SfxNewStyleDlg, OKHdl, ComboBox&, void ) EndDialog( RET_OK ); } -IMPL_LINK_TYPED( SfxNewStyleDlg, ModifyHdl, Edit&, rBox, void ) +IMPL_LINK( SfxNewStyleDlg, ModifyHdl, Edit&, rBox, void ) { m_pOKBtn->Enable( !rBox.GetText().replaceAll(" ", "").isEmpty() ); } diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 97e0e259a4da..5bf8fc44875d 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -28,7 +28,7 @@ #include "dialog.hrc" -IMPL_LINK_TYPED( SfxPasswordDialog, EditModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SfxPasswordDialog, EditModifyHdl, Edit&, rEdit, void ) { ModifyHdl(&rEdit); } @@ -63,7 +63,7 @@ void SfxPasswordDialog::ModifyHdl(Edit* pEdit) mpOKBtn->Enable( bEnable ); } -IMPL_LINK_NOARG_TYPED(SfxPasswordDialog, OKHdl, Button*, void) +IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl, Button*, void) { bool bConfirmFailed = bool( mnExtras & SfxShowExtras::CONFIRM ) && ( GetConfirm() != GetPassword() ); diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 0b72c3478f14..61b2a260cadd 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -271,7 +271,7 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt } } -IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, Button*, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, Button*, void ) { const bool bReduceTransparency = m_pReduceTransparencyCB->IsChecked(); @@ -281,7 +281,7 @@ IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHd m_pTransparencyCB->Enable( !bReduceTransparency ); } -IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, Button*, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, Button*, void ) { const bool bEnable = m_pReduceGradientsCB->IsChecked(); @@ -292,7 +292,7 @@ IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, ToggleReduceGradientsStripesRBHdl(*m_pReduceGradientsStripesRB); } -IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, Button*, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, Button*, void ) { const bool bEnable = m_pReduceBitmapsCB->IsChecked(); @@ -305,21 +305,21 @@ IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, Bu ToggleReduceBitmapsResolutionRBHdl(*m_pReduceBitmapsResolutionRB); } -IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, RadioButton&, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, RadioButton&, void ) { const bool bEnable = m_pReduceGradientsCB->IsChecked() && m_pReduceGradientsStripesRB->IsChecked(); m_pReduceGradientsStepCountNF->Enable( bEnable ); } -IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, RadioButton&, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, RadioButton&, void ) { const bool bEnable = m_pReduceBitmapsCB->IsChecked() && m_pReduceBitmapsResolutionRB->IsChecked(); m_pReduceBitmapsResolutionLB->Enable( bEnable ); } -IMPL_LINK_TYPED( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton&, rButton, void ) +IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton&, rButton, void ) { if( rButton.IsChecked() ) { @@ -330,7 +330,7 @@ IMPL_LINK_TYPED( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioBu ImplSaveControls( &maPrinterOptions ); } -IMPL_LINK_TYPED( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton&, rButton, void ) +IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton&, rButton, void ) { if( rButton.IsChecked() ) { diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index e5151e470961..293f33f6d13a 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -147,8 +147,8 @@ struct SfxSecurityPage_Impl OUString m_aEndRedliningWarning; bool m_bEndRedliningWarningDone; - DECL_LINK_TYPED( RecordChangesCBToggleHdl, CheckBox&, void ); - DECL_LINK_TYPED( ChangeProtectionPBHdl, Button*, void ); + DECL_LINK( RecordChangesCBToggleHdl, CheckBox&, void ); + DECL_LINK( ChangeProtectionPBHdl, Button*, void ); SfxSecurityPage_Impl( SfxSecurityPage &rDlg, const SfxItemSet &rItemSet ); ~SfxSecurityPage_Impl(); @@ -325,7 +325,7 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & ) } -IMPL_LINK_NOARG_TYPED(SfxSecurityPage_Impl, RecordChangesCBToggleHdl, CheckBox&, void) +IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl, CheckBox&, void) { // when change recording gets disabled protection must be disabled as well if (!m_pRecordChangesCB->IsChecked()) // the new check state is already present, thus the '!' @@ -373,7 +373,7 @@ IMPL_LINK_NOARG_TYPED(SfxSecurityPage_Impl, RecordChangesCBToggleHdl, CheckBox&, } -IMPL_LINK_NOARG_TYPED(SfxSecurityPage_Impl, ChangeProtectionPBHdl, Button*, void) +IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl, Button*, void) { if (m_eRedlingMode == RL_NONE) return; diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 1fbeab0a80dd..a31e3563766a 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -934,7 +934,7 @@ void SfxSplitWindow::Command( const CommandEvent& rCEvt ) } -IMPL_LINK_TYPED( SfxSplitWindow, TimerHdl, Timer*, pTimer, void) +IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer, void) { if ( pTimer ) pTimer->Stop(); diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index d108cf500194..7b1d69105566 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -130,7 +130,7 @@ void SearchDialog::SaveConfig() aViewOpt.SetUserItem( "UserItem", aUserItem ); } -IMPL_LINK_NOARG_TYPED(SearchDialog, FindHdl, Button*, void) +IMPL_LINK_NOARG(SearchDialog, FindHdl, Button*, void) { OUString sSrchTxt = m_pSearchEdit->GetText(); sal_Int32 nPos = m_pSearchEdit->GetEntryPos( sSrchTxt ); diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 197a55e4fd5e..038f01b241c7 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -101,7 +101,7 @@ short SfxStyleDialog::Ok() } -IMPL_LINK_NOARG_TYPED( SfxStyleDialog, CancelHdl, Button *, void ) +IMPL_LINK_NOARG( SfxStyleDialog, CancelHdl, Button *, void ) /* [Description] diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 6d00f035a72a..ffc821d53baf 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -803,7 +803,7 @@ short SfxTabDialog::Ok() return bModified ? RET_OK : RET_CANCEL; } -IMPL_LINK_NOARG_TYPED(SfxTabDialog, CancelHdl, Button*, void) +IMPL_LINK_NOARG(SfxTabDialog, CancelHdl, Button*, void) { EndDialog( RET_USER_CANCEL ); } @@ -837,7 +837,7 @@ void SfxTabDialog::RefreshInputSet() } -IMPL_LINK_NOARG_TYPED(SfxTabDialog, OkHdl, Button*, void) +IMPL_LINK_NOARG(SfxTabDialog, OkHdl, Button*, void) /* [Description] @@ -914,7 +914,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() } -IMPL_LINK_NOARG_TYPED(SfxTabDialog, UserHdl, Button*, void) +IMPL_LINK_NOARG(SfxTabDialog, UserHdl, Button*, void) /* [Description] @@ -938,7 +938,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, UserHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) +IMPL_LINK_NOARG(SfxTabDialog, ResetHdl, Button*, void) /* [Description] @@ -956,7 +956,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) +IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl, Button*, void) /* [Description] @@ -1032,7 +1032,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) } -IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) +IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) /* [Description] @@ -1132,7 +1132,7 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) } -IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) +IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) /* [Description] diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index cc4119459bf7..6c98695988c1 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -283,7 +283,7 @@ sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } -IMPL_LINK_NOARG_TYPED(DropListBox_Impl, OnAsyncExecuteDrop, void*, void) +IMPL_LINK_NOARG(DropListBox_Impl, OnAsyncExecuteDrop, void*, void) { pDialog->ActionSelect( SID_STYLE_NEW_BY_EXAMPLE ); } @@ -1436,7 +1436,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl() EnableNew( bCanNew ); } -IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, TimeOut, Idle *, void ) +IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, TimeOut, Idle *, void ) { if(!bDontUpdate) { @@ -1685,7 +1685,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable) } } -IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox&, rBox, void ) { if (SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString() == rBox.GetSelectEntry()) { @@ -1851,7 +1851,7 @@ SfxObjectShell* SfxCommonTemplateDialog_Impl::SaveSelection() return pDocShell; } -IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl&, rBox, bool ) +IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl&, rBox, bool ) { bDontUpdate = true; const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl(); @@ -2056,14 +2056,14 @@ void SfxCommonTemplateDialog_Impl::ResetFocus() } } -IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, TreeListApplyHdl, SvTreeListBox *, bool ) +IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, TreeListApplyHdl, SvTreeListBox *, bool ) { ApplyHdl(nullptr); return false; } // Double-click on a style sheet in the ListBox is applied. -IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, ApplyHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, ApplyHdl, LinkParamNone*, void ) { // only if that region is allowed if ( IsInitialized() && nullptr != pFamilyState[nActFamily-1] && @@ -2078,7 +2078,7 @@ IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, ApplyHdl, LinkParamNone*, v ResetFocus(); } -IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, PreviewHdl, Button*, void) +IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, PreviewHdl, Button*, void) { std::shared_ptr<comphelper::ConfigurationChanges> batch( comphelper::ConfigurationChanges::create() ); officecfg::Office::Common::StylesAndFormatting::Preview::set( aPreviewCheckbox->IsChecked(), batch ); @@ -2103,7 +2103,7 @@ IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, PreviewHdl, Button*, void) } // Selection of a template during the Watercan-Status -IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox, void ) +IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox, void ) { // Trigger Help PI, if this is permitted of call handlers and field if( !pListBox || pListBox->IsSelected( pListBox->GetHdlEntry() ) ) @@ -2146,7 +2146,7 @@ IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pL } } -IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool ) +IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool ) { nLastItemId = pMenu->GetCurItemId(); Application::PostUserEvent( @@ -2154,7 +2154,7 @@ IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool return true; } -IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl, void*, void ) +IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl, void*, void ) { switch(nLastItemId) { case ID_NEW: NewHdl(); break; @@ -2492,13 +2492,13 @@ bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId) } } -IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox, void ) +IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox, void ) { const sal_uInt16 nEntry = pBox->GetCurItemId(); FamilySelect(nEntry); } -IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox, void ) +IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox, void ) { const sal_uInt16 nEntry = pBox->GetCurItemId(); if(nEntry != SID_STYLE_NEW_BY_EXAMPLE || @@ -2506,7 +2506,7 @@ IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox, void ) ActionSelect(nEntry); } -IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void ) +IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void ) { const sal_uInt16 nEntry = pBox->GetCurItemId(); if(nEntry == SID_STYLE_NEW_BY_EXAMPLE && @@ -2557,7 +2557,7 @@ IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void ) } } -IMPL_LINK_TYPED( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); ActionSelect(nMenuId); diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 27f292be0249..58057ac13f48 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -225,7 +225,7 @@ namespace sfx2 } - IMPL_LINK_TYPED( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox, void ) + IMPL_LINK( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox, void ) { const sal_uInt16 nId = pToolBox->GetCurItemId(); diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index bf66c33b88fe..97e7623307f3 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -156,7 +156,7 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta } } -IMPL_LINK_NOARG_TYPED(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl, void*, void) +IMPL_LINK_NOARG(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl, void*, void) { nUserEventId = nullptr; SfxBoolItem* pState = nullptr; diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 985dd1de93e6..cb4dd57062a0 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -374,13 +374,13 @@ void SfxVersionDialog::Open_Impl() Close(); } -IMPL_LINK_NOARG_TYPED(SfxVersionDialog, DClickHdl_Impl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl, SvTreeListBox*, bool) { Open_Impl(); return false; } -IMPL_LINK_NOARG_TYPED(SfxVersionDialog, SelectHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl, SvTreeListBox*, void) { bool bEnable = ( m_pVersionBox->FirstSelected() != nullptr ); SfxObjectShell* pObjShell = pViewFrame->GetObjectShell(); @@ -394,7 +394,7 @@ IMPL_LINK_NOARG_TYPED(SfxVersionDialog, SelectHdl_Impl, SvTreeListBox*, void) m_pCompareButton->Enable(bEnable && eState >= SfxItemState::DEFAULT); } -IMPL_LINK_TYPED( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton, void ) +IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton, void ) { SfxObjectShell *pObjShell = pViewFrame->GetObjectShell(); SvTreeListEntry *pEntry = m_pVersionBox->FirstSelected(); @@ -520,7 +520,7 @@ void SfxViewVersionDialog_Impl::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SfxViewVersionDialog_Impl, ButtonHdl, Button*, pButton, void) +IMPL_LINK(SfxViewVersionDialog_Impl, ButtonHdl, Button*, pButton, void) { assert(pButton == m_pOKButton); (void)pButton; diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 1706d1bd992e..4ef731a89dca 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -161,7 +161,7 @@ void impl_FillURLList( sfx2::FileDialogHelper* _pFileDlg, std::vector<OUString>& } } -IMPL_LINK_NOARG_TYPED(DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, void) +IMPL_LINK_NOARG(DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, void) { DBG_ASSERT( m_pFileDlg, "DocumentInserter::DialogClosedHdl(): no file dialog" ); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 9b90f80af06c..085421d81cf4 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -145,13 +145,13 @@ class SfxNewFileDialog_Impl SfxObjectShellLock xDocShell; VclPtr<SfxNewFileDialog> pAntiImpl; - DECL_LINK_TYPED( Update, Idle *, void ); + DECL_LINK( Update, Idle *, void ); - DECL_LINK_TYPED(RegionSelect, ListBox&, void); - DECL_LINK_TYPED(TemplateSelect, ListBox&, void); - DECL_LINK_TYPED(DoubleClick, ListBox&, void); - DECL_LINK_TYPED(Expand, VclExpander&, void); - DECL_LINK_TYPED(LoadFile, Button*, void); + DECL_LINK(RegionSelect, ListBox&, void); + DECL_LINK(TemplateSelect, ListBox&, void); + DECL_LINK(DoubleClick, ListBox&, void); + DECL_LINK(Expand, VclExpander&, void); + DECL_LINK(LoadFile, Button*, void); sal_uInt16 GetSelectedTemplatePos() const; public: @@ -169,7 +169,7 @@ public: void SetTemplateFlags(SfxTemplateFlags nSet); }; -IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, Update, Idle*, void) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update, Idle*, void) { if (xDocShell.Is()) { @@ -235,7 +235,7 @@ IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, Update, Idle*, void) } } -IMPL_LINK_TYPED( SfxNewFileDialog_Impl, RegionSelect, ListBox&, rBox, void ) +IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox&, rBox, void ) { if (xDocShell.Is() && xDocShell->GetProgress()) return; @@ -259,12 +259,12 @@ IMPL_LINK_TYPED( SfxNewFileDialog_Impl, RegionSelect, ListBox&, rBox, void ) TemplateSelect(*m_pTemplateLb); } -IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, Expand, VclExpander&, void) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Expand, VclExpander&, void) { TemplateSelect(*m_pTemplateLb); } -IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, TemplateSelect, ListBox&, void) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect, ListBox&, void) { // Still loading if ( xDocShell && xDocShell->GetProgress() ) @@ -277,14 +277,14 @@ IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, TemplateSelect, ListBox&, void) aPrevIdle.Start(); } -IMPL_LINK_NOARG_TYPED( SfxNewFileDialog_Impl, DoubleClick, ListBox&, void ) +IMPL_LINK_NOARG( SfxNewFileDialog_Impl, DoubleClick, ListBox&, void ) { // Still loading if ( !xDocShell.Is() || !xDocShell->GetProgress() ) pAntiImpl->EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, LoadFile, Button*, void) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, LoadFile, Button*, void) { pAntiImpl->EndDialog(RET_TEMPLATE_LOAD); } diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index e2d103cf89c4..a4c0db6f0628 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -76,7 +76,7 @@ void SfxSaveAsTemplateDialog::setDocumentModel(const uno::Reference<frame::XMode m_xModel = rModel; } -IMPL_LINK_NOARG_TYPED(SfxSaveAsTemplateDialog, OkClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, OkClickHdl, Button*, void) { ScopedVclPtrInstance< MessageDialog > aQueryDlg(this, OUString(), VclMessageType::Question, VCL_BUTTONS_YES_NO); @@ -99,13 +99,13 @@ IMPL_LINK_NOARG_TYPED(SfxSaveAsTemplateDialog, OkClickHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SfxSaveAsTemplateDialog, TemplateNameEditHdl, Edit&, void) +IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, TemplateNameEditHdl, Edit&, void) { msTemplateName = comphelper::string::strip(mpTemplateNameEdit->GetText(), ' '); SelectCategoryHdl(*mpLBCategory); } -IMPL_LINK_NOARG_TYPED(SfxSaveAsTemplateDialog, SelectCategoryHdl, ListBox&, void) +IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, SelectCategoryHdl, ListBox&, void) { if(mpLBCategory->GetSelectEntryPos() == 0) { diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index fae62da8a5d1..22ed084d32e6 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -447,7 +447,7 @@ void SfxTemplateManagerDlg::writeSettings () aViewSettings.SetUserData(aSettings); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SelectApplicationHdl, ListBox&, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectApplicationHdl, ListBox&, void) { if(mpLocalView->IsVisible()) { @@ -461,7 +461,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SelectApplicationHdl, ListBox&, voi SearchUpdateHdl(*mpSearchFilter); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SelectRegionHdl, ListBox&, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectRegionHdl, ListBox&, void) { const OUString sSelectedRegion = mpCBFolder->GetSelectEntry(); @@ -480,7 +480,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SelectRegionHdl, ListBox&, void) SearchUpdateHdl(*mpSearchFilter); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, void) { const sal_uInt16 nCurItemId = mpActionBar->GetCurItemId(); mpActionBar->SetItemDown( nCurItemId, true ); @@ -493,7 +493,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, void) mpActionBar->Invalidate(); } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*, pItem, void) { const TemplateViewItem *pViewItem = dynamic_cast<const TemplateViewItem*>(pItem); @@ -501,7 +501,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*, OnTemplateState(pItem); } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); @@ -526,7 +526,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, pMenu, bool) return false; } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, DefaultTemplateMenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK(SfxTemplateManagerDlg, DefaultTemplateMenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nId = pMenu->GetCurItemId(); @@ -543,13 +543,13 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, DefaultTemplateMenuSelectHdl, Menu*, pMen return false; } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, OkClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, OkClickHdl, Button*, void) { OnTemplateOpen(); EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, MoveClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, MoveClickHdl, Button*, void) { // modal dialog to select templates category ScopedVclPtrInstance<SfxTemplateCategoryDialog> aDlg; @@ -585,12 +585,12 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, MoveClickHdl, Button*, void) mpLocalView->reload(); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, ExportClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, ExportClickHdl, Button*, void) { OnTemplateExport(); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, ImportClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, ImportClickHdl, Button*, void) { //Modal Dialog to select Category ScopedVclPtrInstance<SfxTemplateCategoryDialog> aDlg; @@ -625,19 +625,19 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, ImportClickHdl, Button*, void) mpActionMenu->HideItem(MNI_ACTION_RENAME_FOLDER); } -IMPL_STATIC_LINK_NOARG_TYPED(SfxTemplateManagerDlg, LinkClickHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SfxTemplateManagerDlg, LinkClickHdl, Button*, void) { OnTemplateLink(); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, OpenRegionHdl, void*, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, OpenRegionHdl, void*, void) { maSelTemplates.clear(); mpOKButton->Disable(); mpActionBar->Show(); } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, CreateContextMenuHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, CreateContextMenuHdl, ThumbnailViewItem*, pItem, void) { const TemplateViewItem *pViewItem = dynamic_cast<TemplateViewItem*>(pItem); @@ -651,7 +651,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, CreateContextMenuHdl, ThumbnailViewItem*, } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) { uno::Sequence< PropertyValue > aArgs(4); aArgs[0].Name = "AsTemplate"; @@ -676,7 +676,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pIte Close(); } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, EditTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, EditTemplateHdl, ThumbnailViewItem*, pItem, void) { uno::Sequence< PropertyValue > aArgs(3); aArgs[0].Name = "AsTemplate"; @@ -701,7 +701,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, EditTemplateHdl, ThumbnailViewItem*, pIte Close(); } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, DeleteTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, DeleteTemplateHdl, ThumbnailViewItem*, pItem, void) { OUString aDeletedTemplate; @@ -732,7 +732,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, DeleteTemplateHdl, ThumbnailViewItem*, pI } } -IMPL_LINK_TYPED(SfxTemplateManagerDlg, DefaultTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateManagerDlg, DefaultTemplateHdl, ThumbnailViewItem*, pItem, void) { TemplateViewItem *pViewItem = static_cast<TemplateViewItem*>(pItem); OUString aServiceName; @@ -761,7 +761,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, DefaultTemplateHdl, ThumbnailViewItem*, p createDefaultTemplateMenu(); } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SearchUpdateHdl, Edit&, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl, Edit&, void) { OUString aKeyword = mpSearchFilter->GetText(); @@ -809,7 +809,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, SearchUpdateHdl, Edit&, void) } } -IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, GetFocusHdl, Control&, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, GetFocusHdl, Control&, void) { mpLocalView->deselectItems(); mpSearchView->deselectItems(); @@ -1322,7 +1322,7 @@ void SfxTemplateCategoryDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SfxTemplateCategoryDialog, NewCategoryEditHdl, Edit&, void) +IMPL_LINK_NOARG(SfxTemplateCategoryDialog, NewCategoryEditHdl, Edit&, void) { OUString sParam = comphelper::string::strip(mpNewCategoryEdit->GetText(), ' '); mpLBCategory->Enable(sParam.isEmpty()); @@ -1339,7 +1339,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateCategoryDialog, NewCategoryEditHdl, Edit&, void } } -IMPL_LINK_NOARG_TYPED(SfxTemplateCategoryDialog, SelectCategoryHdl, ListBox&, void) +IMPL_LINK_NOARG(SfxTemplateCategoryDialog, SelectCategoryHdl, ListBox&, void) { if(mpLBCategory->GetSelectEntryPos() == 0) { @@ -1421,7 +1421,7 @@ short SfxTemplateSelectionDlg::Execute() return ModalDialog::Execute(); } -IMPL_LINK_TYPED(SfxTemplateSelectionDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) +IMPL_LINK(SfxTemplateSelectionDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) { TemplateViewItem *pViewItem = static_cast<TemplateViewItem*>(pItem); msTemplatePath = pViewItem->getPath(); @@ -1429,7 +1429,7 @@ IMPL_LINK_TYPED(SfxTemplateSelectionDlg, OpenTemplateHdl, ThumbnailViewItem*, pI EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SfxTemplateSelectionDlg, OkClickHdl, Button*, void) +IMPL_LINK_NOARG(SfxTemplateSelectionDlg, OkClickHdl, Button*, void) { TemplateViewItem *pViewItem = static_cast<TemplateViewItem*>(const_cast<ThumbnailViewItem*>(*maSelTemplates.begin())); msTemplatePath = pViewItem->getPath(); diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index 2ef9c1f9582d..3b917f9ee6c6 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -59,7 +59,7 @@ private: sal_uInt16 nPos, bool bNewLine ); - DECL_LINK_TYPED( TimerHdl, Timer*, void ); + DECL_LINK( TimerHdl, Timer*, void ); bool CursorIsOverRect() const; void SetPinned_Impl( bool ); void SetFadeIn_Impl( bool ); diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx index c7d3fb7997b4..8c2a24c3fb4c 100644 --- a/sfx2/source/inc/templatesearchview.hxx +++ b/sfx2/source/inc/templatesearchview.hxx @@ -23,7 +23,7 @@ public: void setOpenTemplateHdl (const Link<ThumbnailViewItem*, void> &rLink); - DECL_LINK_TYPED(ContextMenuSelectHdl, Menu*, bool); + DECL_LINK(ContextMenuSelectHdl, Menu*, bool); void setCreateContextMenuHdl(const Link<ThumbnailViewItem*,void> &rLink); diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index f9f55e79207e..937e2a3f9e7e 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace frame { class DropListBox_Impl : public SvTreeListBox { private: - DECL_LINK_TYPED(OnAsyncExecuteDrop, void *, void); + DECL_LINK(OnAsyncExecuteDrop, void *, void); protected: SfxCommonTemplateDialog_Impl* pDialog; @@ -209,13 +209,13 @@ protected: bool m_bWantHierarchical :1; bool bBindingUpdate :1; - DECL_LINK_TYPED( FilterSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( FmtSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ApplyHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( TreeListApplyHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( DropHdl, StyleTreeListBox_Impl&, bool ); - DECL_LINK_TYPED( TimeOut, Idle*, void ); - DECL_LINK_TYPED( PreviewHdl, Button*, void); + DECL_LINK( FilterSelectHdl, ListBox&, void ); + DECL_LINK( FmtSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ApplyHdl, LinkParamNone*, void ); + DECL_LINK( TreeListApplyHdl, SvTreeListBox*, bool ); + DECL_LINK( DropHdl, StyleTreeListBox_Impl&, bool ); + DECL_LINK( TimeOut, Idle*, void ); + DECL_LINK( PreviewHdl, Button*, void); virtual void EnableItem(sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true) {} @@ -286,8 +286,8 @@ public: SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window* ); virtual ~SfxCommonTemplateDialog_Impl() override; - DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool ); - DECL_LINK_TYPED( MenuSelectAsyncHdl, void*, void ); + DECL_LINK( MenuSelectHdl, Menu*, bool ); + DECL_LINK( MenuSelectAsyncHdl, void*, void ); virtual void EnableEdit( bool b ) { @@ -350,10 +350,10 @@ private: VclPtr<DropToolBox_Impl> m_aActionTbL; VclPtr<ToolBox> m_aActionTbR; - DECL_LINK_TYPED( ToolBoxLSelect, ToolBox*, void ); - DECL_LINK_TYPED( ToolBoxRSelect, ToolBox*, void ); - DECL_LINK_TYPED( ToolBoxRClick, ToolBox*, void ); - DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool ); + DECL_LINK( ToolBoxLSelect, ToolBox*, void ); + DECL_LINK( ToolBoxRSelect, ToolBox*, void ); + DECL_LINK( ToolBoxRClick, ToolBox*, void ); + DECL_LINK( MenuSelectHdl, Menu*, bool ); protected: virtual void EnableEdit( bool ) override; diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx index 01f62f6e7682..50572d7da5b1 100644 --- a/sfx2/source/inc/tplcitem.hxx +++ b/sfx2/source/inc/tplcitem.hxx @@ -29,7 +29,7 @@ class SfxTemplateControllerItem : public SfxControllerItem { sal_uInt8 nWaterCanState; ImplSVEvent* nUserEventId; - DECL_LINK_TYPED(SetWaterCanStateHdl_Impl, void*, void); + DECL_LINK(SetWaterCanStateHdl_Impl, void*, void); protected: virtual void StateChanged(sal_uInt16, SfxItemState, const SfxPoolItem* pState) override; diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index 0d99c641e20e..3fe32e8e065b 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -57,9 +57,9 @@ class SfxVersionDialog : public SfxModalDialog SfxVersionTableDtor* m_pTable; bool m_bIsSaveVersionOnClose; - DECL_LINK_TYPED( DClickHdl_Impl, SvTreeListBox*, bool); - DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED( ButtonHdl_Impl, Button*, void ); + DECL_LINK( DClickHdl_Impl, SvTreeListBox*, bool); + DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK( ButtonHdl_Impl, Button*, void ); void Init_Impl(); void Open_Impl(); @@ -80,7 +80,7 @@ class SfxViewVersionDialog_Impl : public SfxModalDialog VclPtr<CloseButton> m_pCloseButton; SfxVersionInfo& m_rInfo; - DECL_LINK_TYPED(ButtonHdl, Button*, void); + DECL_LINK(ButtonHdl, Button*, void); public: SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVersionInfo& rInfo, bool bEdit); diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 31c4a02a4a04..dbd3a513a87b 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -131,7 +131,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ ) } -IMPL_STATIC_LINK_TYPED( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, p, void ) { ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); try @@ -157,7 +157,7 @@ VclPtr<vcl::Window> SfxURLToolBoxControl_Impl::CreateItemWindow( vcl::Window* pP return pURLBox.get(); } -IMPL_LINK_NOARG_TYPED(SfxURLToolBoxControl_Impl, SelectHdl, ComboBox&, void) +IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, SelectHdl, ComboBox&, void) { SvtURLBox* pURLBox = GetURLBox(); OUString aName( pURLBox->GetURL() ); @@ -166,7 +166,7 @@ IMPL_LINK_NOARG_TYPED(SfxURLToolBoxControl_Impl, SelectHdl, ComboBox&, void) OpenURL( aName, false ); } -IMPL_LINK_NOARG_TYPED(SfxURLToolBoxControl_Impl, OpenHdl, SvtURLBox*, void) +IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl, SvtURLBox*, void) { SvtURLBox* pURLBox = GetURLBox(); OpenURL( pURLBox->GetURL(), pURLBox->IsCtrlOpen() ); diff --git a/sfx2/source/notebookbar/DropdownBox.cxx b/sfx2/source/notebookbar/DropdownBox.cxx index dd162cdf9f39..705103af7f06 100644 --- a/sfx2/source/notebookbar/DropdownBox.cxx +++ b/sfx2/source/notebookbar/DropdownBox.cxx @@ -132,7 +132,7 @@ void DropdownBox::ShowContent() } } -IMPL_LINK_TYPED(DropdownBox, PBClickHdl, Button*, /*pButton*/, void) +IMPL_LINK(DropdownBox, PBClickHdl, Button*, /*pButton*/, void) { if (m_pPopup) m_pPopup.disposeAndClear(); diff --git a/sfx2/source/notebookbar/DropdownBox.hxx b/sfx2/source/notebookbar/DropdownBox.hxx index d0794b327872..cabd38f5183b 100644 --- a/sfx2/source/notebookbar/DropdownBox.hxx +++ b/sfx2/source/notebookbar/DropdownBox.hxx @@ -46,7 +46,7 @@ public: void ShowContent(); private: - DECL_LINK_TYPED(PBClickHdl, Button*, void); + DECL_LINK(PBClickHdl, Button*, void); }; #endif diff --git a/sfx2/source/notebookbar/PriorityHBox.cxx b/sfx2/source/notebookbar/PriorityHBox.cxx index 307bad56293d..fd8243f3f4ea 100644 --- a/sfx2/source/notebookbar/PriorityHBox.cxx +++ b/sfx2/source/notebookbar/PriorityHBox.cxx @@ -136,10 +136,10 @@ public: } private: - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); }; -IMPL_LINK_TYPED( PriorityHBox, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( PriorityHBox, WindowEventListener, VclWindowEvent&, rEvent, void ) { if (rEvent.GetId() == VCLEVENT_WINDOW_RESIZE) { diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index dd3bb66f0e18..94f75116278b 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -327,7 +327,7 @@ void SfxNotebookBar::RemoveListeners(SystemWindow* pSysWindow) } } -IMPL_STATIC_LINK_TYPED(SfxNotebookBar, OpenNotebookbarPopupMenu, NotebookBar*, pNotebookbar, void) +IMPL_STATIC_LINK(SfxNotebookBar, OpenNotebookbarPopupMenu, NotebookBar*, pNotebookbar, void) { if (pNotebookbar) { diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx index 81c68d50e11a..5c6ae4c77f1b 100644 --- a/sfx2/source/notify/hintpost.cxx +++ b/sfx2/source/notify/hintpost.cxx @@ -39,7 +39,7 @@ void SfxHintPoster::Post( SfxRequest* pHintToPost ) AddFirstRef(); } -IMPL_LINK_TYPED( SfxHintPoster, DoEvent_Impl, void *, pPostedHint, void ) +IMPL_LINK( SfxHintPoster, DoEvent_Impl, void *, pPostedHint, void ) { m_Link.Call( static_cast<SfxRequest*>(pPostedHint) ); ReleaseRef(); diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx index af3f9b60b406..495d62f8eb7b 100644 --- a/sfx2/source/sidebar/AsynchronousCall.cxx +++ b/sfx2/source/sidebar/AsynchronousCall.cxx @@ -57,7 +57,7 @@ void AsynchronousCall::CancelRequest() } } -IMPL_LINK_NOARG_TYPED(AsynchronousCall, HandleUserCall, void*, void ) +IMPL_LINK_NOARG(AsynchronousCall, HandleUserCall, void*, void ) { mnCallId = nullptr; if (maAction) diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 989c9ae9b94e..15a9c3a87119 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -296,7 +296,7 @@ void Deck::PrintWindowSubTree(vcl::Window* pRoot, int nIndentation) PrintWindowSubTree(pRoot->GetChild(nIndex), nIndentation + 1); } -IMPL_LINK_NOARG_TYPED(Deck, HandleVerticalScrollBarChange, ScrollBar*, void) +IMPL_LINK_NOARG(Deck, HandleVerticalScrollBarChange, ScrollBar*, void) { const sal_Int32 nYOffset (-mpVerticalScrollBar->GetThumbPos()); mpScrollContainer->SetPosPixel(Point(mpScrollContainer->GetPosPixel().X(), diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index b12995b0abba..1a4350830bb3 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -506,7 +506,7 @@ void FocusManager::HandleKeyEvent ( } } -IMPL_LINK_TYPED(FocusManager, WindowEventListener, VclWindowEvent&, rWindowEvent, void) +IMPL_LINK(FocusManager, WindowEventListener, VclWindowEvent&, rWindowEvent, void) { vcl::Window* pSource = rWindowEvent.GetWindow(); if (pSource == nullptr) @@ -535,7 +535,7 @@ IMPL_LINK_TYPED(FocusManager, WindowEventListener, VclWindowEvent&, rWindowEvent } } -IMPL_LINK_TYPED(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void) { vcl::Window* pSource = rEvent.GetWindow(); if (pSource == nullptr) diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index efb0911563f3..56e888851929 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -859,7 +859,7 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement ( } } -IMPL_LINK_TYPED(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void) +IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void) { if (rEvent.GetWindow() == mpParentWindow) { @@ -993,7 +993,7 @@ VclPtr<PopupMenu> SidebarController::CreatePopupMenu ( return pMenu; } -IMPL_LINK_TYPED(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool) +IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool) { if (pMenu == nullptr) { diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 02d91653a8da..150e9d33eaba 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -218,7 +218,7 @@ void SidebarToolBox::RegisterHandlers() } } -IMPL_LINK_TYPED(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox, void) { if (pToolBox != nullptr) { @@ -232,7 +232,7 @@ IMPL_LINK_TYPED(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox, void) } } -IMPL_LINK_TYPED(SidebarToolBox, ClickHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, ClickHandler, ToolBox*, pToolBox, void) { if (pToolBox == nullptr) return; @@ -242,7 +242,7 @@ IMPL_LINK_TYPED(SidebarToolBox, ClickHandler, ToolBox*, pToolBox, void) xController->click(); } -IMPL_LINK_TYPED(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox, void) { if (pToolBox == nullptr) return; @@ -252,7 +252,7 @@ IMPL_LINK_TYPED(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox, void) xController->doubleClick(); } -IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) { if (pToolBox == nullptr) return; @@ -262,7 +262,7 @@ IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) xController->execute((sal_Int16)pToolBox->GetModifier()); } -IMPL_LINK_NOARG_TYPED(SidebarToolBox, ChangedIconSizeHandler, LinkParamNone*, void) +IMPL_LINK_NOARG(SidebarToolBox, ChangedIconSizeHandler, LinkParamNone*, void) { SolarMutexGuard g; diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index c16f9d190a14..0471cacf21e1 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -309,7 +309,7 @@ Image TabBar::GetItemImage(const DeckDescriptor& rDeckDescriptor) const mxFrame); } -IMPL_LINK_NOARG_TYPED(TabBar::Item, HandleClick, Button*, void) +IMPL_LINK_NOARG(TabBar::Item, HandleClick, Button*, void) { try { @@ -386,7 +386,7 @@ void TabBar::UpdateFocusManager(FocusManager& rFocusManager) rFocusManager.SetButtons(aButtons); } -IMPL_LINK_NOARG_TYPED(TabBar, OnToolboxClicked, Button*, void) +IMPL_LINK_NOARG(TabBar, OnToolboxClicked, Button*, void) { if (!mpMenuButton) return; diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index caf606b2a66a..820764330184 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -164,7 +164,7 @@ void TitleBar::PaintFocus(vcl::RenderContext& rRenderContext, const Rectangle& r rRenderContext.Pop(); } -IMPL_LINK_TYPED(TitleBar, SelectionHandler, ToolBox*, pToolBox, void) +IMPL_LINK(TitleBar, SelectionHandler, ToolBox*, pToolBox, void) { (void)pToolBox; OSL_ASSERT(maToolBox.get()==pToolBox); diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index 1c883a90f209..79386a821884 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -62,8 +62,8 @@ public: Image GetImage( sal_uInt16 nId, bool bBig ); void SetSymbolsSize_Impl( sal_Int16 ); - DECL_LINK_TYPED( OptionsChanged_Impl, LinkParamNone*, void ); - DECL_LINK_TYPED( SettingsChanged_Impl, VclSimpleEvent&, void ); + DECL_LINK( OptionsChanged_Impl, LinkParamNone*, void ); + DECL_LINK( SettingsChanged_Impl, VclSimpleEvent&, void ); explicit SfxImageManager_Impl(SfxModule& rModule); ~SfxImageManager_Impl(); @@ -194,13 +194,13 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) } -IMPL_LINK_NOARG_TYPED(SfxImageManager_Impl, OptionsChanged_Impl, LinkParamNone*, void) +IMPL_LINK_NOARG(SfxImageManager_Impl, OptionsChanged_Impl, LinkParamNone*, void) { SetSymbolsSize_Impl( m_aOpt.GetCurrentSymbolsSize() ); } -IMPL_LINK_TYPED( SfxImageManager_Impl, SettingsChanged_Impl, VclSimpleEvent&, rEvent, void) +IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, VclSimpleEvent&, rEvent, void) { switch (rEvent.GetId()) { diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index b76167087b0f..ba6da54dd466 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -189,10 +189,10 @@ struct SfxToolBoxControl_Impl sal_uInt16 nSlotId; VclPtr<SfxPopupWindow> mpFloatingWindow; VclPtr<SfxPopupWindow> mpPopupWindow; - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); }; -IMPL_LINK_TYPED( SfxToolBoxControl_Impl, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclWindowEvent&, rEvent, void ) { if ( ( rEvent.GetId() == VCLEVENT_WINDOW_MOVE ) || ( rEvent.GetId() == VCLEVENT_WINDOW_ACTIVATE )) @@ -608,7 +608,7 @@ void SfxToolBoxControl::SetPopupWindow( SfxPopupWindow* pWindow ) } -IMPL_LINK_NOARG_TYPED(SfxToolBoxControl, PopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl, FloatingWindow*, void) { if ( pImpl->mpPopupWindow->IsVisible() ) { @@ -630,7 +630,7 @@ IMPL_LINK_NOARG_TYPED(SfxToolBoxControl, PopupModeEndHdl, FloatingWindow*, void) } -IMPL_LINK_TYPED( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow, void ) +IMPL_LINK( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow, void ) { if ( pWindow == pImpl->mpFloatingWindow ) pImpl->mpFloatingWindow = nullptr; diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index eaa94b752738..01ada5970bbb 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -58,7 +58,7 @@ class ClassificationCategoriesController : public ClassificationCategoriesContro rtl::Reference<comphelper::ConfigurationListener> m_xListener; ClassificationPropertyListener m_aPropertyListener; - DECL_LINK_TYPED(SelectHdl, ListBox&, void); + DECL_LINK(SelectHdl, ListBox&, void); public: explicit ClassificationCategoriesController(const uno::Reference<uno::XComponentContext>& rContext); @@ -170,7 +170,7 @@ uno::Reference<awt::XWindow> ClassificationCategoriesController::createItemWindo return uno::Reference<awt::XWindow>(VCLUnoHelper::GetInterface(m_pClassification)); } -IMPL_LINK_TYPED(ClassificationCategoriesController, SelectHdl, ListBox&, rCategory, void) +IMPL_LINK(ClassificationCategoriesController, SelectHdl, ListBox&, rCategory, void) { OUString aEntry = rCategory.GetSelectEntry(); diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 4954e4ddd745..bc98810fe4c1 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -123,7 +123,7 @@ public: virtual ~SfxInPlaceClient_Impl() override; void SizeHasChanged(); - DECL_LINK_TYPED(TimerHdl, Timer *, void); + DECL_LINK(TimerHdl, Timer *, void); uno::Reference < frame::XFrame > GetFrame() const; // XEmbeddedClient @@ -591,7 +591,7 @@ void SfxInPlaceClient_Impl::SizeHasChanged() } -IMPL_LINK_NOARG_TYPED(SfxInPlaceClient_Impl, TimerHdl, Timer *, void) +IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl, Timer *, void) { if ( m_pClient && m_xObject.is() ) { diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 55403850a63a..b2c58bed31ad 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1477,7 +1477,7 @@ void SfxBaseController::ShowInfoBars( ) } } -IMPL_LINK_NOARG_TYPED ( SfxBaseController, CheckOutHandler, Button*, void ) +IMPL_LINK_NOARG ( SfxBaseController, CheckOutHandler, Button*, void ) { if ( m_pData->m_pViewShell ) m_pData->m_pViewShell->GetObjectShell()->CheckOut( ); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index b9e6280fcd25..f84b8b2cd2d6 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1316,7 +1316,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } -IMPL_LINK_NOARG_TYPED(SfxViewFrame, SwitchReadOnlyHandler, Button*, void) +IMPL_LINK_NOARG(SfxViewFrame, SwitchReadOnlyHandler, Button*, void) { GetDispatcher()->Execute(SID_EDITDOC); } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 94ac3dcc413b..616af3e99c28 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -412,7 +412,7 @@ private: SfxItemSet* _pOptions; bool _bHelpDisabled; - DECL_LINK_TYPED( Execute, Button*, void ); + DECL_LINK( Execute, Button*, void ); public: SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSetupDialog* pParent ); @@ -433,7 +433,7 @@ SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSe { } -IMPL_LINK_NOARG_TYPED(SfxDialogExecutor_Impl, Execute, Button*, void) +IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute, Button*, void) { // Options noted locally if ( !_pOptions ) diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index d03878c8b39c..757741169e77 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -138,7 +138,7 @@ private: uno::Reference< datatransfer::clipboard::XClipboardNotifier > m_xClpbrdNtfr; uno::Reference< lang::XComponent > m_xCtrl; - DECL_STATIC_LINK_TYPED( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, void*, void ); }; SfxClipboardChangeListener::SfxClipboardChangeListener( SfxViewShell* pView, const uno::Reference< datatransfer::clipboard::XClipboardNotifier >& xClpbrdNtfr ) @@ -173,7 +173,7 @@ void SfxClipboardChangeListener::ChangedContents() } } -IMPL_STATIC_LINK_TYPED( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, void*, p, void ) { AsyncExecuteInfo* pAsyncExecuteInfo = static_cast<AsyncExecuteInfo*>(p); if ( pAsyncExecuteInfo ) |