From 9bb254fc85eea7615cf8b9fa3700754fbd4c971c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 9 May 2015 21:35:10 +0200 Subject: NOINSTANCE is implied now in IMPL_STATIC_LINK... Change-Id: Ifb032457d6c1b279c4183282ef2b271c706dd71a --- avmedia/source/framework/mediacontrol.cxx | 2 +- basctl/source/basicide/baside3.cxx | 2 +- basctl/source/basicide/basobj2.cxx | 2 +- basctl/source/basicide/iderdll.cxx | 2 +- basic/source/classes/sbxmod.cxx | 2 +- chart2/source/controller/dialogs/dlg_DataEditor.cxx | 2 +- chart2/source/controller/dialogs/tp_Scale.cxx | 2 +- cui/source/dialogs/hlmailtp.cxx | 2 +- cui/source/dialogs/scriptdlg.cxx | 2 +- cui/source/dialogs/thesdlg.cxx | 2 +- cui/source/options/optinet2.cxx | 6 +++--- cui/source/options/treeopt.cxx | 2 +- cui/source/tabpages/chardlg.cxx | 2 +- cui/source/tabpages/paragrph.cxx | 2 +- cui/source/tabpages/tparea.cxx | 2 +- desktop/source/app/app.cxx | 6 +++--- desktop/source/app/officeipcthread.cxx | 4 ++-- embeddedobj/test/mtexecutor/mainthreadexecutor.cxx | 2 +- filter/source/pdf/impdialog.cxx | 2 +- filter/source/xsltdialog/xmlfiltertabdialog.cxx | 4 ++-- framework/source/fwe/classes/addonsoptions.cxx | 2 +- framework/source/layoutmanager/layoutmanager.cxx | 2 +- framework/source/uielement/complextoolbarcontroller.cxx | 4 ++-- framework/source/uielement/generictoolbarcontroller.cxx | 2 +- framework/source/uielement/macrosmenucontroller.cxx | 2 +- framework/source/uielement/newmenucontroller.cxx | 2 +- framework/source/uielement/recentfilesmenucontroller.cxx | 2 +- framework/source/uielement/toolbarmanager.cxx | 2 +- framework/source/uielement/toolbarsmenucontroller.cxx | 2 +- include/tools/link.hxx | 8 ++++---- reportdesign/source/ui/report/dlgedfac.cxx | 2 +- sc/source/core/data/userdat.cxx | 2 +- sc/source/ui/condformat/condformatdlg.cxx | 2 +- sc/source/ui/docshell/externalrefmgr.cxx | 2 +- sc/source/ui/miscdlgs/acredlin.cxx | 2 +- sc/source/ui/optdlg/calcoptionsdlg.cxx | 2 +- sc/source/ui/optdlg/opredlin.cxx | 2 +- sc/source/ui/pagedlg/scuitphfedit.cxx | 2 +- sc/source/ui/view/preview.cxx | 2 +- sc/source/ui/view/viewdata.cxx | 2 +- sd/source/ui/annotations/annotationwindow.cxx | 2 +- sd/source/ui/app/sdmod1.cxx | 2 +- sd/source/ui/dlg/headerfooterdlg.cxx | 2 +- sd/source/ui/dlg/navigatr.cxx | 2 +- sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 2 +- sfx2/source/control/recentdocsview.cxx | 2 +- sfx2/source/dialog/dinfdlg.cxx | 4 ++-- sfx2/source/inet/inettbc.cxx | 2 +- sfx2/source/menu/virtmenu.cxx | 2 +- sfx2/source/sidebar/SidebarToolBox.cxx | 4 ++-- sfx2/source/view/viewsh.cxx | 2 +- svl/source/numbers/zforlist.cxx | 2 +- svtools/source/contnr/imivctl1.cxx | 2 +- svtools/source/dialogs/addresstemplate.cxx | 2 +- svtools/source/hatchwindow/documentcloser.cxx | 2 +- svtools/source/uno/contextmenuhelper.cxx | 2 +- svtools/source/uno/generictoolboxcontroller.cxx | 2 +- svtools/source/uno/popupmenucontrollerbase.cxx | 2 +- svtools/source/uno/popupwindowcontroller.cxx | 2 +- svtools/source/uno/toolboxcontroller.cxx | 2 +- svx/source/engine3d/float3d.cxx | 2 +- svx/source/engine3d/objfac3d.cxx | 2 +- svx/source/form/fmobjfac.cxx | 2 +- svx/source/gallery2/galbrws2.cxx | 2 +- svx/source/gallery2/galmisc.cxx | 2 +- sw/source/core/draw/dobjfac.cxx | 2 +- sw/source/ui/dbui/mmoutputtypepage.cxx | 4 ++-- sw/source/ui/dialog/uiregionsw.cxx | 2 +- sw/source/ui/dialog/wordcountdialog.cxx | 2 +- sw/source/ui/table/tabledlg.cxx | 2 +- sw/source/uibase/app/apphdl.cxx | 2 +- sw/source/uibase/dbui/dbui.cxx | 2 +- sw/source/uibase/envelp/syncbtn.cxx | 2 +- sw/source/uibase/ribbar/workctrl.cxx | 2 +- sw/source/uibase/uiview/viewling.cxx | 2 +- sw/source/uibase/utlui/glbltree.cxx | 2 +- test/source/bootstrapfixture.cxx | 2 +- test/source/vclbootstrapprotector.cxx | 2 +- toolkit/source/awt/asynccallback.cxx | 2 +- unotools/source/ucbhelper/ucblockbytes.cxx | 2 +- vcl/generic/print/genprnpsp.cxx | 2 +- vcl/source/app/svapp.cxx | 4 ++-- vcl/unx/generic/app/sm.cxx | 8 ++++---- vcl/workben/svpclient.cxx | 2 +- 84 files changed, 101 insertions(+), 101 deletions(-) diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 01ca132356a7..a05c54bacd3f 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -479,7 +479,7 @@ IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p ) -IMPL_STATIC_LINK_NOINSTANCE_NOARG(MediaControl, implVolumeEndHdl) +IMPL_STATIC_LINK_NOARG(MediaControl, implVolumeEndHdl) { return 0; } diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index b31b4260ab93..1575aa67fc74 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -227,7 +227,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt ) -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( DialogWindow, NotifyUndoActionHdl, SfxUndoAction *, pUndoAction ) { // #i120515# pUndoAction needs to be deleted, this hand over is an ownership diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 9b8778336994..530d0fc26c5c 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -210,7 +210,7 @@ namespace DECL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData* ); }; - IMPL_STATIC_LINK_NOINSTANCE( MacroExecution, ExecuteMacroEvent, MacroExecutionData*, i_pData ) + IMPL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData*, i_pData ) { ENSURE_OR_RETURN( i_pData, "wrong MacroExecutionData", 0L ); // take ownership of the data diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 36155235fea8..24a2bf4dcf43 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -174,7 +174,7 @@ void ExtraData::SetSearchItem (const SvxSearchItem& rItem) pSearchItem.reset(static_cast(rItem.Clone())); } -IMPL_STATIC_LINK_NOINSTANCE(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic) +IMPL_STATIC_LINK(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic) { long nRet = 0; if (Shell* pShell = GetShell()) diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 4a19ffdbf088..502186c14d93 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -474,7 +474,7 @@ public: DECL_STATIC_LINK( AsyncQuitHandler, OnAsyncQuit, void* ); }; -IMPL_STATIC_LINK_NOINSTANCE_NOARG( AsyncQuitHandler, OnAsyncQuit ) +IMPL_STATIC_LINK_NOARG( AsyncQuitHandler, OnAsyncQuit ) { QuitApplication(); return 0L; diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 4ccae7b9f702..53088a50a9a3 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -180,7 +180,7 @@ IMPL_LINK_NOARG(DataEditor, MiscHdl) return 0L; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(DataEditor, CellModified) +IMPL_STATIC_LINK_NOARG(DataEditor, CellModified) { return 0; } diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index b62fec755d5d..0e1265170368 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -157,7 +157,7 @@ void ScaleTabPage::dispose() SfxTabPage::dispose(); } -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( ScaleTabPage, FmtFieldModifiedHdl, FormattedField*, pFmtFied ) { if( pFmtFied ) diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index ce07304b2115..5c0f79f2043e 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -244,7 +244,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) |* |************************************************************************/ -IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl) +IMPL_STATIC_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl) { SfxViewFrame* pViewFrame = SfxViewFrame::Current(); if( pViewFrame ) diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 2a5e29efefe2..4bddaae613f9 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -1483,7 +1483,7 @@ short SvxScriptErrorDialog::Execute() return 0; } -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, OUString*, pMessage ) { OUString message; diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 81e7c7347b05..f5739672b840 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -437,7 +437,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox return 0; } -IMPL_STATIC_LINK_NOINSTANCE( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pBox ) +IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pBox ) { if (pBox && pBox->GetEntryCount() >= 2) pBox->SelectEntryPos( 1 ); // pos 0 is a 'header' that is not selectable diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 3694490e86b4..91296cb5a1d5 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -544,7 +544,7 @@ IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox ) -IMPL_STATIC_LINK_NOINSTANCE( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) +IMPL_STATIC_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) { OUString aValue = pEdit->GetText(); @@ -732,7 +732,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl) return 0; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxSecurityTabPage, MasterPasswordHdl) +IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl) { try { @@ -839,7 +839,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl) return 0; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxSecurityTabPage, MacroSecPBHdl) +IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl) { try { diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 7644fbfd348b..cf6021e63106 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -728,7 +728,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl) } // an opened group shall be completely visible -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) { pBox->Update(); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 97b6a957c873..ec30ed37a87e 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2905,7 +2905,7 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl) -IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxCharPositionPage, PairKerningHdl_Impl) +IMPL_STATIC_LINK_NOARG(SvxCharPositionPage, PairKerningHdl_Impl) { return 0; } diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 46c204a24e06..8b647f452aab 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -2262,7 +2262,7 @@ void SvxAsianTabPage::Reset( const SfxItemSet* rSet ) lcl_SetBox(*rSet, SID_ATTR_PARA_SCRIPTSPACE, *m_pScriptSpaceCB ); } -IMPL_STATIC_LINK_NOINSTANCE( SvxAsianTabPage, ClickHdl_Impl, CheckBox*, pBox ) +IMPL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, CheckBox*, pBox ) { pBox->EnableTriState( false ); return 0; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 2e344e9bd77d..441fecb0928b 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -202,7 +202,7 @@ void SvxTransparenceTabPage::ActivateGradient(bool bActivate) } } -IMPL_STATIC_LINK_NOINSTANCE_NOARG( +IMPL_STATIC_LINK_NOARG( SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl) { return 0L; diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index b1adc632ebdb..8a86c5416ccc 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1714,7 +1714,7 @@ int Desktop::doShutdown() return EXIT_SUCCESS; } -IMPL_STATIC_LINK_NOINSTANCE( Desktop, ImplInitFilterHdl, ConvertData*, pData ) +IMPL_STATIC_LINK( Desktop, ImplInitFilterHdl, ConvertData*, pData ) { return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( pData ); } @@ -1864,7 +1864,7 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings ) } -IMPL_STATIC_LINK_NOINSTANCE_TYPED(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void) +IMPL_STATIC_LINK_TYPED(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void) { DoFirstRunInitializations(); } @@ -1907,7 +1907,7 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl) } // enable acceptos -IMPL_STATIC_LINK_NOINSTANCE_NOARG(Desktop, EnableAcceptors_Impl) +IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl) { enableAcceptors(); return 0; diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index d87980ffab44..cb6ad0b98c02 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -286,7 +286,7 @@ public: DECL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void* pEvent ); }; -IMPL_STATIC_LINK_NOINSTANCE( ProcessEventsClass_Impl, CallEvent, void*, pEvent ) +IMPL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void*, pEvent ) { // Application events are processed by the Desktop::HandleAppEvent implementation. Desktop::HandleAppEvent( *static_cast(pEvent) ); @@ -294,7 +294,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ProcessEventsClass_Impl, CallEvent, void*, pEvent ) return 0; } -IMPL_STATIC_LINK_NOINSTANCE( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent ) +IMPL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent ) { // Documents requests are processed by the OfficeIPCThread implementation ProcessDocumentsRequest* pDocsRequest = static_cast(pEvent); diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx index d7a5c1b614ff..09760748a039 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx @@ -77,7 +77,7 @@ uno::Any SAL_CALL MainThreadExecutor::execute( const uno::Sequence< beans::Named } -IMPL_STATIC_LINK_NOINSTANCE( MainThreadExecutor, worker, MainThreadExecutorRequest*, pThreadExecutorRequest ) +IMPL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest*, pThreadExecutorRequest ) { pThreadExecutorRequest->doIt(); diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index ed1a5b4ba1a9..b0f8fe93f552 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1737,7 +1737,7 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear ) } -IMPL_STATIC_LINK_NOINSTANCE_NOARG( ImpPDFTabSigningPage, SelectLBSignTSA ) +IMPL_STATIC_LINK_NOARG( ImpPDFTabSigningPage, SelectLBSignTSA ) { return 0; } diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index ed400201b3c8..21948e9eb37c 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -294,7 +294,7 @@ IMPL_LINK_NOARG(XMLFilterTabDialog, OkHdl) -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) { const sal_uInt16 nId = pTabCtrl->GetCurPageId(); @@ -306,7 +306,7 @@ IMPL_STATIC_LINK_NOINSTANCE( -IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool ) +IMPL_STATIC_LINK_NOARG_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool ) { return true; } diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 88922705e522..570ca906b964 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -1651,7 +1651,7 @@ Mutex& AddonsOptions::GetOwnStaticMutex() return *pMutex; } -IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG ) +IMPL_STATIC_LINK( AddonsOptions, Notify, void*, EMPTYARG ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->ReadConfigurationData(); diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 10883475c3f5..9f0b811f6668 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2620,7 +2620,7 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose) return 0; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(LayoutManager, SettingsChanged) +IMPL_STATIC_LINK_NOARG(LayoutManager, SettingsChanged) { return 1; } diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 220024924481..9d013f4021a7 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -196,7 +196,7 @@ throw ( RuntimeException, std::exception ) } } -IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { SolarMutexReleaser aReleaser; try @@ -214,7 +214,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, ExecuteHdl_Impl, ExecuteI return 0; } -IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, Notify_Impl, NotifyInfo*, pNotifyInfo ) +IMPL_STATIC_LINK( ComplexToolbarController, Notify_Impl, NotifyInfo*, pNotifyInfo ) { SolarMutexReleaser aReleaser; try diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 500f525cc223..22af8489ca84 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -269,7 +269,7 @@ throw ( RuntimeException, std::exception ) } } -IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { SolarMutexReleaser aReleaser; try diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index b64813ef1e39..9bcccc489c1a 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -138,7 +138,7 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc } } -IMPL_STATIC_LINK_NOINSTANCE( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { try { diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index dd77e27a0a54..9a02716b1082 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -523,7 +523,7 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) } } -IMPL_STATIC_LINK_NOINSTANCE( NewMenuController, ExecuteHdl_Impl, NewDocument*, pNewDocument ) +IMPL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument*, pNewDocument ) { /* i62706: Don't catch all exceptions. We hide all problems here and are not able to handle them on higher levels. diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index ee6e7e4ad775..1ea02d21dc63 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -402,7 +402,7 @@ throw( RuntimeException, std::exception ) } } -IMPL_STATIC_LINK_NOINSTANCE( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile*, pLoadRecentFile ) +IMPL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile*, pLoadRecentFile ) { try { diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 0c0eb437d0d4..46d04d9e5894 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -2101,7 +2101,7 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, AsyncUpdateControllersHdl, Timer *, void) UpdateControllers(); } -IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { try { diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index bc197cef06ba..1f7de7e056cb 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -851,7 +851,7 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume } } -IMPL_STATIC_LINK_NOINSTANCE( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { try { diff --git a/include/tools/link.hxx b/include/tools/link.hxx index e8337cc227f9..45e72980d7fd 100644 --- a/include/tools/link.hxx +++ b/include/tools/link.hxx @@ -53,14 +53,14 @@ } \ sal_IntPtr Class::Member(SAL_UNUSED_PARAMETER void *) -#define IMPL_STATIC_LINK_NOINSTANCE(Class, Member, ArgType, ArgName) \ +#define IMPL_STATIC_LINK(Class, Member, ArgType, ArgName) \ sal_IntPtr Class::LinkStub##Member(void * instance, void * data) { \ return Member( \ static_cast(instance), static_cast(data)); \ } \ sal_IntPtr Class::Member(SAL_UNUSED_PARAMETER Class *, ArgType ArgName) -#define IMPL_STATIC_LINK_NOINSTANCE_NOARG(Class, Member) \ +#define IMPL_STATIC_LINK_NOARG(Class, Member) \ sal_IntPtr Class::LinkStub##Member(void * instance, void * data) { \ return Member(static_cast(instance), data); \ } \ @@ -95,14 +95,14 @@ } \ RetType Class::Member(SAL_UNUSED_PARAMETER ArgType) -#define IMPL_STATIC_LINK_NOINSTANCE_TYPED( \ +#define IMPL_STATIC_LINK_TYPED( \ Class, Member, ArgType, ArgName, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return Member(static_cast(instance), data); \ } \ RetType Class::Member(SAL_UNUSED_PARAMETER Class *, ArgType ArgName) -#define IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( \ +#define IMPL_STATIC_LINK_NOARG_TYPED( \ Class, Member, ArgType, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return Member(static_cast(instance), data); \ diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 3915da73ee5b..b9b4a02f0d5f 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -46,7 +46,7 @@ DlgEdFactory::~DlgEdFactory() -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { if ( pObjFactory->nInventor == ReportInventor ) diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx index 4581edf6df35..9cc9aeddec9d 100644 --- a/sc/source/core/data/userdat.cxx +++ b/sc/source/core/data/userdat.cxx @@ -31,7 +31,7 @@ ScDrawObjFactory::~ScDrawObjFactory() SdrObjFactory::RemoveMakeUserDataHdl( LINK ( this, ScDrawObjFactory, MakeUserData ) ); } -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory ) { if ( pObjFactory->nInventor == SC_DRAWLAYER ) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 2a81a8423831..0e2cbf5738d5 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -573,7 +573,7 @@ IMPL_LINK( ScCondFormatDlg, RangeGetFocusHdl, formula::RefEdit*, pEdit ) return 0; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG( ScCondFormatDlg, RangeLoseFocusHdl ) +IMPL_STATIC_LINK_NOARG( ScCondFormatDlg, RangeLoseFocusHdl ) { //mpLastEdit = NULL; return 0; diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index cccf39c102a0..6791f57b674e 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1337,7 +1337,7 @@ void ScExternalRefLink::SetDoReferesh(bool b) mbDoRefresh = b; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(ScExternalRefLink, ExternalRefEndEditHdl) +IMPL_STATIC_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl) { return 0; } diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 18b7b24b94cc..d7854dd9e1c0 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -1864,7 +1864,7 @@ void ScAcceptChgDlg::InitFilter() } } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(ScAcceptChgDlg, FilterModified) +IMPL_STATIC_LINK_NOARG(ScAcceptChgDlg, FilterModified) { return 0; } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 85141b020c85..2b82a92bb0d8 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -673,7 +673,7 @@ struct Reduction : Op } -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton*, pButton) { pButton->Disable(); diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 08c807309e00..a64726346311 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -194,7 +194,7 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ ) } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(ScRedlineOptionsTabPage, ColorHdl) +IMPL_STATIC_LINK_NOARG(ScRedlineOptionsTabPage, ColorHdl) { return 0; } diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index ee68914de2ec..f7063f85610e 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -828,7 +828,7 @@ IMPL_LINK( ScHFEditPage, ClickHdl, PushButton*, pBtn ) return 0; } -IMPL_STATIC_LINK_NOINSTANCE( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) +IMPL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) { pActiveEdWnd = ::GetScEditWindow(); if ( !pActiveEdWnd ) diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 07ce02a88e5d..b5448cbc64bd 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -927,7 +927,7 @@ void ScPreview::StaticInvalidate() rBindings.Invalidate(SID_ATTR_ZOOMSLIDER); } -IMPL_STATIC_LINK_NOINSTANCE_NOARG( ScPreview, InvalidateHdl ) +IMPL_STATIC_LINK_NOARG( ScPreview, InvalidateHdl ) { StaticInvalidate(); return 0; diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 71ef92a8564d..a2872ba3ca5a 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1090,7 +1090,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // needed, wenn position changed } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(ScViewData, EmptyEditHdl) +IMPL_STATIC_LINK_NOARG(ScViewData, EmptyEditHdl) { return 0; } diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index ba881e88d41e..6ed8eb39dbf4 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -513,7 +513,7 @@ IMPL_LINK(AnnotationWindow, ScrollHdl, ScrollBar*, pScroll) return 0; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(AnnotationWindow, ModifyHdl) +IMPL_STATIC_LINK_NOARG(AnnotationWindow, ModifyHdl) { return 0; } diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index adb22b15ac53..79d10ba494c4 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -416,7 +416,7 @@ void SdModule::GetState(SfxItemSet& rItemSet) } } -IMPL_STATIC_LINK_NOINSTANCE( SdModule, EventListenerHdl, VclSimpleEvent*, pEvent ) +IMPL_STATIC_LINK( SdModule, EventListenerHdl, VclSimpleEvent*, pEvent ) { if( pEvent && (pEvent->GetId() == VCLEVENT_WINDOW_COMMAND) && static_cast(pEvent)->GetData() ) { diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 61dfb38f8a7d..1fe443c1eea2 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -266,7 +266,7 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) return 0; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED(HeaderFooterDialog, DeactivatePageHdl, TabControl *, bool) +IMPL_STATIC_LINK_NOARG_TYPED(HeaderFooterDialog, DeactivatePageHdl, TabControl *, bool) { return true; } diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 1f891e580ea1..f00a422d9ae7 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -313,7 +313,7 @@ IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void) } } -IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( +IMPL_STATIC_LINK_NOARG_TYPED( SdNavigatorWin, ClickToolboxHdl, ToolBox *, void) {} diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 94eb6800ebfd..cae6b2724504 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -137,7 +137,7 @@ Any CacheConfiguration::GetValue (const OUString& rName) return aResult; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void) +IMPL_STATIC_LINK_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void) { CacheConfigSharedPtr &rInstancePtr = theInstance::get(); // Release our reference to the instance. diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index a398e1994bfd..c3aabda5c4aa 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -303,7 +303,7 @@ void RecentDocsView::Clear() ThumbnailView::Clear(); } -IMPL_STATIC_LINK_NOINSTANCE( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile*, pLoadRecentFile ) +IMPL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile*, pLoadRecentFile ) { try { diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index c074d5804ea1..f6a2a0547181 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -862,7 +862,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, SignatureHdl) return 0; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(SfxDocumentPage, ChangePassHdl) +IMPL_STATIC_LINK_NOARG(SfxDocumentPage, ChangePassHdl) { SfxObjectShell* pShell = SfxObjectShell::Current(); do @@ -1510,7 +1510,7 @@ void CustomPropertiesWindow::dispose() vcl::Window::dispose(); } -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( CustomPropertiesWindow, TypeHdl, CustomPropertiesTypeBox*, pBox ) { long nType = reinterpret_cast( pBox->GetSelectEntryData() ); diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index e5d4fb020037..04564cdd8b0f 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -134,7 +134,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ ) -IMPL_STATIC_LINK_NOINSTANCE( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { try { diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 11615859234b..67c13c98b82a 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -483,7 +483,7 @@ void SfxVirtualMenu::CreateFromSVMenu() // called on activation of the SV-Menu -IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( +IMPL_STATIC_LINK_NOARG_TYPED( SfxVirtualMenu, Highlight, Menu *, bool ) { diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 18c3b2937908..a879299607b6 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -273,11 +273,11 @@ IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) xController->execute((sal_Int16)pToolBox->GetModifier()); } -IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( +IMPL_STATIC_LINK_NOARG_TYPED( SidebarToolBox, ActivateToolBox, ToolBox*, void) {} -IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( +IMPL_STATIC_LINK_NOARG_TYPED( SidebarToolBox, DeactivateToolBox, ToolBox*, void) {} diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index ab14264ee890..cb7ab2e9fc2e 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -170,7 +170,7 @@ void SfxClipboardChangeListener::ChangedContents() } } -IMPL_STATIC_LINK_NOINSTANCE( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, AsyncExecuteInfo*, pAsyncExecuteInfo ) +IMPL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, AsyncExecuteInfo*, pAsyncExecuteInfo ) { if ( pAsyncExecuteInfo ) { diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 04ee5d51a097..8b8f03f3e15d 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3169,7 +3169,7 @@ const NfCurrencyEntry* SvNumberFormatter::GetLegacyOnlyCurrencyEntry( const OUSt // static -IMPL_STATIC_LINK_NOINSTANCE_NOARG( SvNumberFormatter, CurrencyChangeLink ) +IMPL_STATIC_LINK_NOARG( SvNumberFormatter, CurrencyChangeLink ) { ::osl::MutexGuard aGuard( GetMutex() ); OUString aAbbrev; diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 62066db2dbf8..561246b21065 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -253,7 +253,7 @@ IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar ) return 0; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxIconChoiceCtrl_Impl, EndScrollHdl) +IMPL_STATIC_LINK_NOARG(SvxIconChoiceCtrl_Impl, EndScrollHdl) { return 0; } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 64c6612cc763..a7ae81865c30 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -1134,7 +1134,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_STATIC_LINK_NOINSTANCE( + IMPL_STATIC_LINK( AddressBookSourceDialog, OnComboGetFocus, ComboBox*, _pBox) { _pBox->SaveValue(); diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index f93a951e4ed0..82e2ae3135cb 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -98,7 +98,7 @@ void MainThreadFrameCloserRequest::Start( MainThreadFrameCloserRequest* pMTReque } -IMPL_STATIC_LINK_NOINSTANCE( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserRequest*, pMTRequest ) +IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserRequest*, pMTRequest ) { if ( pMTRequest ) { diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index e46adf6d71cb..8324df404798 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -609,7 +609,7 @@ ContextMenuHelper::completeMenuProperties( } -IMPL_STATIC_LINK_NOINSTANCE( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { // Release solar mutex to prevent deadlocks with clipboard thread SolarMutexReleaser aReleaser; diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index f0a50647a1e6..da53d908b3e3 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -167,7 +167,7 @@ throw ( RuntimeException, std::exception ) } } -IMPL_STATIC_LINK_NOINSTANCE( GenericToolboxController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { try { diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 9e2090a52dd6..993ee1276bb9 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -156,7 +156,7 @@ void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, cons } -IMPL_STATIC_LINK_NOINSTANCE( PopupMenuControllerBase, ExecuteHdl_Impl, PopupMenuControllerBaseDispatchInfo*, pDispatchInfo ) +IMPL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, PopupMenuControllerBaseDispatchInfo*, pDispatchInfo ) { pDispatchInfo->mxDispatch->dispatch( pDispatchInfo->maURL, pDispatchInfo->maArgs ); delete pDispatchInfo; diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 7f480680c5a4..9410bf607365 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -123,7 +123,7 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclSimpleEvent*, pEve -IMPL_STATIC_LINK_NOINSTANCE( PopupWindowControllerImpl, AsyncDeleteWindowHdl, vcl::Window*, pWindow ) +IMPL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, vcl::Window*, pWindow ) { pWindow->disposeOnce(); return 0; diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index afdde4d52509..7086a34dcc84 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -763,7 +763,7 @@ throw( com::sun::star::uno::Exception, std::exception) -IMPL_STATIC_LINK_NOINSTANCE( ToolboxController, ExecuteHdl_Impl, DispatchInfo*, pDispatchInfo ) +IMPL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, DispatchInfo*, pDispatchInfo ) { pDispatchInfo->mxDispatch->dispatch( pDispatchInfo->maURL, pDispatchInfo->maArgs ); delete pDispatchInfo; diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 29d6808a4782..356bf4c39381 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2641,7 +2641,7 @@ void Svx3DWin::ClickLight(PushButton& rBtn) -IMPL_STATIC_LINK_NOINSTANCE_NOARG(Svx3DWin, ChangeLightCallbackHdl) +IMPL_STATIC_LINK_NOARG(Svx3DWin, ChangeLightCallbackHdl) { return 0L; } diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx index 286a93933faa..a494d897b4e7 100644 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -45,7 +45,7 @@ E3dObjFactory::~E3dObjFactory() // Generate chart internal objects -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( E3dObjFactory, MakeObject, SdrObjFactory*, pObjFactory) { if ( pObjFactory->nInventor == E3dInventor ) diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index e9a722460e25..7538d04851ff 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -110,7 +110,7 @@ namespace } } -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory) { if (pObjFactory->nInventor == FmFormInventor) diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 7d91faf1dfb7..c1d49fefc85c 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -73,7 +73,7 @@ struct DispatchInfo css::uno::Reference< css::frame::XDispatch > Dispatch; }; -IMPL_STATIC_LINK_NOINSTANCE( GalleryBrowser2, AsyncDispatch_Impl, DispatchInfo*, pDispatchInfo ) +IMPL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, DispatchInfo*, pDispatchInfo ) { if ( pDispatchInfo && pDispatchInfo->Dispatch.is() ) { diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index cac4a3f05af8..368f955923e5 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -76,7 +76,7 @@ BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ) return aBmpEx; } -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( SgaUserDataFactory, MakeUserData, SdrObjFactory*, pObjFactory ) { if ( pObjFactory->nInventor == IV_IMAPINFO && pObjFactory->nIdentifier == ID_IMAPINFO ) diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx index 7ff5e165cda3..9a870e946584 100644 --- a/sw/source/core/draw/dobjfac.cxx +++ b/sw/source/core/draw/dobjfac.cxx @@ -23,7 +23,7 @@ SwObjectFactory aSwObjectFactory; -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( SwObjectFactory, MakeObject, SdrObjFactory*, pObjFactory ) { if ( pObjFactory->nInventor == SWGInventor ) diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 72d4d2c78088..84b62ba2344c 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -391,7 +391,7 @@ IMPL_LINK_NOARG(SwSendMailDialog, CloseHdl_Impl) return 0; } -IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StartSendMails, SwSendMailDialog*, pDialog ) +IMPL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog*, pDialog ) { pDialog->SendMails(); return 0; @@ -419,7 +419,7 @@ IMPL_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, pTimer, void ) } } -IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StopSendMails, SwSendMailDialog*, pDialog ) +IMPL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog*, pDialog ) { if(pDialog->m_pImpl->xMailDispatcher.is() && pDialog->m_pImpl->xMailDispatcher->isStarted()) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 4fda5f86b5a2..1f2520aa70ae 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1700,7 +1700,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox ) return 0; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG( +IMPL_STATIC_LINK_NOARG( SwInsertSectionTabPage, ChangeEditInReadonlyHdl) { return 0; diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 3eb1d4591be3..7184c39437ab 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -34,7 +34,7 @@ #include #include -IMPL_STATIC_LINK_NOINSTANCE_NOARG(SwWordCountFloatDlg, CloseHdl) +IMPL_STATIC_LINK_NOARG(SwWordCountFloatDlg, CloseHdl) { SfxViewFrame* pVFrame = ::GetActiveView()->GetViewFrame(); if (pVFrame != NULL) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 7f82f5e7150d..f96ccb5cca0e 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1803,7 +1803,7 @@ IMPL_LINK( SwTextFlowPage, SplitHdl_Impl, CheckBox*, pBox ) return 0; } -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( SwTextFlowPage, SplitRowHdl_Impl, TriStateBox*, pBox ) { pBox->EnableTriState(false); diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index ff543d6d5cc6..cccc8b7bd8a0 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -541,7 +541,7 @@ IMPL_LINK_NOARG(SwMailMergeWizardExecutor, DestroyDialogHdl) return 0L; } -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( SwMailMergeWizardExecutor, DestroyWizardHdl, AbstractMailMergeWizard*, pDialog ) { diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx index 96f115addb5d..3d72d3e3aee8 100644 --- a/sw/source/uibase/dbui/dbui.cxx +++ b/sw/source/uibase/dbui/dbui.cxx @@ -140,7 +140,7 @@ void CancelableDialog::Show() Dialog::Show(); } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(CancelableDialog, DlgClosedHdl) +IMPL_STATIC_LINK_NOARG(CancelableDialog, DlgClosedHdl) { return 0; } diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx index 1c38be2256cd..fd1b66ec0b6c 100644 --- a/sw/source/uibase/envelp/syncbtn.cxx +++ b/sw/source/uibase/envelp/syncbtn.cxx @@ -79,7 +79,7 @@ void SwSyncBtnDlg::dispose() SfxFloatingWindow::dispose(); } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(SwSyncBtnDlg, BtnHdl) +IMPL_STATIC_LINK_NOARG(SwSyncBtnDlg, BtnHdl) { SfxViewFrame::Current()->GetDispatcher()->Execute(FN_UPDATE_ALL_LINKS, SfxCallMode::ASYNCHRON); return 0; diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 07faafc17683..142a1746ad59 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -238,7 +238,7 @@ void SwTbxAutoTextCtrl::StateChanged( sal_uInt16, GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) ); } -IMPL_STATIC_LINK_NOINSTANCE(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu) +IMPL_STATIC_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu) { sal_uInt16 nId = pMenu->GetCurItemId(); diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 669d7e3fb178..f5556db78991 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -606,7 +606,7 @@ public: DECL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo* ); }; -IMPL_STATIC_LINK_NOINSTANCE( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { SolarMutexReleaser aReleaser; try diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 03d9f166c3f5..27ddf863620e 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -1217,7 +1217,7 @@ SwNavigationPI* SwGlobalTree::GetParentWindow() return static_cast(Window::GetParent()); } -IMPL_STATIC_LINK_NOINSTANCE(SwGlobalTree, ShowFrameHdl, SwGlobalTree*, EMPTYARG) +IMPL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*, EMPTYARG) { const SfxObjectShell* pShell = SwGlobalTree::GetShowShell(); SfxViewFrame* pFirst = pShell ? SfxViewFrame::GetFirst(pShell) : NULL; diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index fe4823d4cd27..40a68ce1f694 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -221,7 +221,7 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor #endif } -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( test::BootstrapFixture, ImplInitFilterHdl, ConvertData*, pData) { return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( pData ); diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx index b2991b1de898..d2671aaeee49 100644 --- a/test/source/vclbootstrapprotector.cxx +++ b/test/source/vclbootstrapprotector.cxx @@ -63,7 +63,7 @@ private: // unobootstrapprotector) is called before InitVCL (above), but component // context is disposed (redundantly again in unobootstrapprotector) from within // DeInitVCL (cf. Desktop::DeInit, desktop/source/app/app.cxx): -IMPL_STATIC_LINK_NOINSTANCE(Protector, deinitHook, void *, EMPTYARG) { +IMPL_STATIC_LINK(Protector, deinitHook, void *, EMPTYARG) { css::uno::Reference context; try { context = comphelper::getProcessComponentContext(); diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index 889ee80f04ee..391cccf6e782 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -97,7 +97,7 @@ void SAL_CALL AsyncCallback::addCallback(const css::uno::Reference< css::awt::XC } // private asynchronous link to call reference to the callback object -IMPL_STATIC_LINK_NOINSTANCE( AsyncCallback, Notify_Impl, CallbackData*, pCallbackData ) +IMPL_STATIC_LINK( AsyncCallback, Notify_Impl, CallbackData*, pCallbackData ) { try { diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 5072d60be8d4..b5968bc47d4d 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1505,7 +1505,7 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const return ERRCODE_NONE; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(UcbLockBytes, DataAvailHdl) +IMPL_STATIC_LINK_NOARG(UcbLockBytes, DataAvailHdl) { return 0; } diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 8bccc3d83ae5..425b71764b0e 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -1305,7 +1305,7 @@ void PrinterUpdate::doUpdate() pInst->PostPrintersChanged(); } -IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( PrinterUpdate, UpdateTimerHdl, Idle*, void ) +IMPL_STATIC_LINK_NOARG_TYPED( PrinterUpdate, UpdateTimerHdl, Idle*, void ) { if( nActiveJobs < 1 ) { diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 3a56cd9e6bbc..7910b83b65e1 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -382,7 +382,7 @@ void Application::Yield() ImplYield( true, false ); } -IMPL_STATIC_LINK_NOINSTANCE( ImplSVAppData, ImplQuitMsg, void*, EMPTYARG ) +IMPL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void*, EMPTYARG ) { ImplGetSVData()->maAppData.mbAppQuit = true; return 0; @@ -804,7 +804,7 @@ ImplSVEvent * Application::PostScrollEvent( sal_uLong nEvent, vcl::Window *pWin, #endif // !HAVE_FEATURE_DESKTOP -IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData ) +IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData ) { const SolarMutexGuard aGuard; ImplPostEventData* pData = static_cast< ImplPostEventData * >( pCallData ); diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 96107dcacf54..9d309213bbb3 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -240,7 +240,7 @@ bool SessionManagerClient::checkDocumentsSaved() return m_bDocSaveDone; } -IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, SaveYourselfHdl, void*, pStateVal ) +IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, pStateVal ) { // Decode argument smuggled in as void*: sal_uIntPtr nStateVal = reinterpret_cast< sal_uIntPtr >(pStateVal); @@ -283,7 +283,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, SaveYourselfHdl, void*, pStat return 0; } -IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, InteractionHdl, void*, EMPTYARG ) +IMPL_STATIC_LINK( SessionManagerClient, InteractionHdl, void*, EMPTYARG ) { SAL_INFO("vcl.sm", "interaction link"); if( m_pSession ) @@ -295,7 +295,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, InteractionHdl, void*, EMPTYA return 0; } -IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, ShutDownCancelHdl, void*, EMPTYARG ) +IMPL_STATIC_LINK( SessionManagerClient, ShutDownCancelHdl, void*, EMPTYARG ) { SAL_INFO("vcl.sm", "shutdown cancel"); if( m_pSession ) @@ -345,7 +345,7 @@ void SessionManagerClient::SaveYourselfProc( SAL_INFO("vcl.sm", "waiting for save yourself event to be processed" ); } -IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, ShutDownHdl, void*, EMPTYARG ) +IMPL_STATIC_LINK( SessionManagerClient, ShutDownHdl, void*, EMPTYARG ) { if( m_pSession ) { diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 30b96c56dbd5..b0577d9e62e2 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -238,7 +238,7 @@ IMPL_LINK( MyWin, ListHdl, Button*, ) return 0; } -IMPL_STATIC_LINK_NOINSTANCE( MyWin, QuitHdl, Button*, ) +IMPL_STATIC_LINK( MyWin, QuitHdl, Button*, ) { processCommand( "quit" ); return 0; -- cgit