Remove unnecessary STATIC_LINK macro

Change-Id: I4788824667c8e0d1d4e0717b7ae7737bb0fd2c90

66 files changed, 102 insertions, 104 deletions

diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 43d1be3d6b1f..646dd2f387a5 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -358,7 +358,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
                 MacroExecutionData* pExecData = new MacroExecutionData;
                 pExecData->aDocument = aDocument;
                 pExecData->xMethod = pMethod;   // keep alive until the event has been processed
-                Application::PostUserEvent( STATIC_LINK( NULL, MacroExecution, ExecuteMacroEvent ), pExecData );
+                Application::PostUserEvent( LINK( NULL, MacroExecution, ExecuteMacroEvent ), pExecData );
             }
         }
         break;
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index fc5194af6567..9ca5201839d4 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -723,14 +723,14 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
     m_xModifiable = xModifiable;
     SvHeaderTabListBox&    rListBox = mpImpl->pEventLB->GetListBox();
     HeaderBar&            rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
-    Link                aLnk(STATIC_LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
+    Link                aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
     mpImpl->pDeletePB->SetClickHdl(    aLnk );
     mpImpl->pAssignPB->SetClickHdl(    aLnk );
     if( mpImpl->pAssignComponentPB )
         mpImpl->pAssignComponentPB->SetClickHdl( aLnk );
-    rListBox.SetDoubleClickHdl( STATIC_LINK(this, _SvxMacroTabPage, DoubleClickHdl_Impl ) );
+    rListBox.SetDoubleClickHdl( LINK(this, _SvxMacroTabPage, DoubleClickHdl_Impl ) );
 
-    rListBox.SetSelectHdl( STATIC_LINK( this, _SvxMacroTabPage, SelectEvent_Impl ));
+    rListBox.SetSelectHdl( LINK( this, _SvxMacroTabPage, SelectEvent_Impl ));
 
     rListBox.SetSelectionMode( SINGLE_SELECTION );
     rListBox.SetTabs( &nTabs[0], MAP_APPFONT );
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 3b2a4c949561..dc55f899db19 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -238,7 +238,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,
     //InitHdl wants to use virtual methods, so it
     //can't be called during the ctor, so init
     //it on next event cycle post-ctor
-    Application::PostUserEvent( STATIC_LINK(
+    Application::PostUserEvent( LINK(
                         this, SpellDialog, InitHdl ) );
 }
 
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 0b24ea2a535c..22c3c277082a 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -556,7 +556,7 @@ void SfxInsertFloatingFrameDialog::Init()
     get(m_pNMMarginHeight, "height");
     get(m_pCBMarginHeightDefault, "defaultheight");
 
-    Link aLink( STATIC_LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
+    Link aLink( LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
     m_pCBMarginWidthDefault->SetClickHdl( aLink );
     m_pCBMarginHeightDefault->SetClickHdl( aLink );
 
@@ -565,7 +565,7 @@ void SfxInsertFloatingFrameDialog::Init()
     m_pRBScrollingAuto->Check();
     m_pRBFrameBorderOn->Check();
 
-    m_pBTOpen->SetClickHdl( STATIC_LINK( this, SfxInsertFloatingFrameDialog, OpenHdl ) );
+    m_pBTOpen->SetClickHdl( LINK( this, SfxInsertFloatingFrameDialog, OpenHdl ) );
 }
 
 short SfxInsertFloatingFrameDialog::Execute()
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 4a98eb59a44b..a12e68c7fe21 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -443,7 +443,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox
 
     //! workaround to set the selection since calling SelectEntryPos within
     //! the double click handler does not work
-    Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog, SelectFirstHdl_Impl ), pBox );
+    Application::PostUserEvent( LINK( this, SvxThesaurusDialog, SelectFirstHdl_Impl ), pBox );
     return 0;
 }
 
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index ced57182cea9..9c384f04800d 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -197,7 +197,7 @@ void _SfxMacroTabPage::LaunchFillGroup()
 {
     if (!mpImpl->maFillGroupIdle.GetIdleHdl().IsSet())
     {
-        mpImpl->maFillGroupIdle.SetIdleHdl( STATIC_LINK( this, _SfxMacroTabPage, TimeOut_Impl ) );
+        mpImpl->maFillGroupIdle.SetIdleHdl( LINK( this, _SfxMacroTabPage, TimeOut_Impl ) );
         mpImpl->maFillGroupIdle.SetPriority( SchedulerPriority::HIGHEST );
         mpImpl->maFillGroupIdle.Start();
     }
@@ -369,15 +369,15 @@ void _SfxMacroTabPage::InitAndSetHandler()
 {
     SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
     HeaderBar&          rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
-    Link                aLnk(STATIC_LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
+    Link                aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
     mpImpl->pMacroLB->SetDoubleClickHdl( aLnk );
     mpImpl->pDeletePB->SetClickHdl( aLnk );
     mpImpl->pAssignPB->SetClickHdl( aLnk );
     rListBox.SetDoubleClickHdl( aLnk );
 
-    rListBox.SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectEvent_Impl ));
-    mpImpl->pGroupLB->SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectGroup_Impl ));
-    mpImpl->pMacroLB->SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectMacro_Impl ));
+    rListBox.SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectEvent_Impl ));
+    mpImpl->pGroupLB->SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectGroup_Impl ));
+    mpImpl->pMacroLB->SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectMacro_Impl ));
 
     rListBox.SetSelectionMode( SINGLE_SELECTION );
     rListBox.SetTabs( &nTabs[0], MAP_APPFONT );
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index f6a6b3f7de54..bdc91ac2793f 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -316,7 +316,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
             }
 
             SvxBrushItem* pBrushItem = new SvxBrushItem(*it, aEmptyStr, GPOS_AREA, SID_ATTR_BRUSH);
-            pBrushItem->SetDoneLink(STATIC_LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
+            pBrushItem->SetDoneLink(LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
 
             SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
             pInfo->pBrushItem = pBrushItem;
@@ -409,7 +409,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
             SdrObject::Free(pObj);
 
             SvxBrushItem* pBrushItem = new SvxBrushItem(Graphic(aMeta), GPOS_AREA, SID_ATTR_BRUSH);
-            pBrushItem->SetDoneLink(STATIC_LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
+            pBrushItem->SetDoneLink(LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
 
             SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
             pInfo->pBrushItem = pBrushItem;
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index b3e5330af84c..d87980ffab44 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -309,12 +309,12 @@ IMPL_STATIC_LINK_NOINSTANCE( ProcessEventsClass_Impl, ProcessDocumentsEvent, voi
 
 void ImplPostForeignAppEvent( ApplicationEvent* pEvent )
 {
-    Application::PostUserEvent( STATIC_LINK( NULL, ProcessEventsClass_Impl, CallEvent ), pEvent );
+    Application::PostUserEvent( LINK( NULL, ProcessEventsClass_Impl, CallEvent ), pEvent );
 }
 
 void ImplPostProcessDocumentsEvent( ProcessDocumentsRequest* pEvent )
 {
-    Application::PostUserEvent( STATIC_LINK( NULL, ProcessEventsClass_Impl, ProcessDocumentsEvent ), pEvent );
+    Application::PostUserEvent( LINK( NULL, ProcessEventsClass_Impl, ProcessDocumentsEvent ), pEvent );
 }
 
 oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSignalInfo* pInfo)
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index b3fc0d8511d3..13073d5d74b9 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -338,7 +338,7 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
     if(rFormat.pGraphicBrush)
     {
         pGraphicBrush = new SvxBrushItem(*rFormat.pGraphicBrush);
-        pGraphicBrush->SetDoneLink( STATIC_LINK( this, SvxNumberFormat, GraphicArrived) );
+        pGraphicBrush->SetDoneLink( LINK( this, SvxNumberFormat, GraphicArrived) );
     }
     DELETEZ(pBulletFont);
     if(rFormat.pBulletFont)
@@ -402,7 +402,7 @@ void SvxNumberFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem,
     {
         delete pGraphicBrush;
         pGraphicBrush =  static_cast<SvxBrushItem*>(pBrushItem->Clone());
-        pGraphicBrush->SetDoneLink( STATIC_LINK( this, SvxNumberFormat, GraphicArrived) );
+        pGraphicBrush->SetDoneLink( LINK( this, SvxNumberFormat, GraphicArrived) );
    }
 
     if(pOrient)
@@ -422,7 +422,7 @@ void SvxNumberFormat::SetGraphic( const OUString& rName )
 
     delete pGraphicBrush;
     pGraphicBrush = new SvxBrushItem( rName, "", GPOS_AREA, 0 );
-    pGraphicBrush->SetDoneLink( STATIC_LINK( this, SvxNumberFormat, GraphicArrived) );
+    pGraphicBrush->SetDoneLink( LINK( this, SvxNumberFormat, GraphicArrived) );
     if( eVertOrient == text::VertOrientation::NONE )
         eVertOrient = text::VertOrientation::TOP;
 
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
index f363295914f2..09760748a039 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
@@ -69,7 +69,7 @@ uno::Any SAL_CALL MainThreadExecutor::execute( const uno::Sequence< beans::Named
     if ( xJob.is() )
     {
         MainThreadExecutorRequest* pMainThreadExecutorRequest = new MainThreadExecutorRequest( xJob, aValues );
-        Application::PostUserEvent( STATIC_LINK( NULL, MainThreadExecutor, worker ), pMainThreadExecutorRequest );
+        Application::PostUserEvent( LINK( NULL, MainThreadExecutor, worker ), pMainThreadExecutorRequest );
     }
 
     // TODO: wait for result
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index dd13a1e2453d..c51b579b283b 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -153,7 +153,7 @@ namespace bib
             }
             if(bExecute)
             {
-                Application::PostUserEvent( STATIC_LINK( this, BibView, CallMappingHdl ) );
+                Application::PostUserEvent( LINK( this, BibView, CallMappingHdl ) );
             }
         }
     }
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 563aa8a57067..f317f32457f9 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -516,7 +516,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
         }
         else if( _rURL.Complete == "slot:5503" || aCommand == "CloseDoc" )
         {
-            Application::PostUserEvent( STATIC_LINK( this, BibFrameController_Impl,
+            Application::PostUserEvent( LINK( this, BibFrameController_Impl,
                                         DisposeHdl ), 0 );
 
         }
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index d8d3bd334ca1..7ac70bb3e6b0 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -795,7 +795,7 @@ namespace frm
             m_bProdStarted = false;
 
             // Kick off download (caution: can be synchronous).
-            m_pMedium->Download(STATIC_LINK(this, OClickableImageBaseModel, DownloadDoneLink));
+            m_pMedium->Download(LINK(this, OClickableImageBaseModel, DownloadDoneLink));
         }
         else
         {
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index fda0c56321b9..993fd4b88d11 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -523,7 +523,7 @@ void SvtFileDialog::Init_Impl
 
     // Create control element, the order defines the tab control.
     _pImp->_pEdFileName->SetSelectHdl( LINK( this, SvtFileDialog, EntrySelectHdl_Impl ) );
-    _pImp->_pEdFileName->SetOpenHdl( STATIC_LINK( this, SvtFileDialog, OpenHdl_Impl ) );
+    _pImp->_pEdFileName->SetOpenHdl( LINK( this, SvtFileDialog, OpenHdl_Impl ) );
 
     // in folder picker mode, only auto-complete directories (no files)
     bool bIsFolderPicker = ( _pImp->_eDlgType == FILEDLG_TYPE_PATHDLG );
@@ -613,14 +613,14 @@ void SvtFileDialog::Init_Impl
     }
 
     // Setting preferences of the control elements.
-    _pImp->_pBtnNewFolder->SetClickHdl( STATIC_LINK( this, SvtFileDialog, NewFolderHdl_Impl ) );
-    _pImp->_pBtnFileOpen->SetClickHdl( STATIC_LINK( this, SvtFileDialog, OpenHdl_Impl ) );
+    _pImp->_pBtnNewFolder->SetClickHdl( LINK( this, SvtFileDialog, NewFolderHdl_Impl ) );
+    _pImp->_pBtnFileOpen->SetClickHdl( LINK( this, SvtFileDialog, OpenHdl_Impl ) );
     _pImp->_pBtnCancel->SetClickHdl( LINK( this, SvtFileDialog, CancelHdl_Impl ) );
-    _pImp->SetFilterListSelectHdl( STATIC_LINK( this, SvtFileDialog, FilterSelectHdl_Impl ) );
-    _pImp->_pEdFileName->SetGetFocusHdl( STATIC_LINK( this, SvtFileDialog, FileNameGetFocusHdl_Impl ) );
-    _pImp->_pEdFileName->SetModifyHdl( STATIC_LINK( this, SvtFileDialog, FileNameModifiedHdl_Impl ) );
-    _pImp->_pEdCurrentPath->SetOpenHdl ( STATIC_LINK( this, SvtFileDialog, URLBoxModifiedHdl_Impl ) );
-    _pImp->_pBtnConnectToServer->SetClickHdl( STATIC_LINK ( this, SvtFileDialog, ConnectToServerPressed_Hdl ) );
+    _pImp->SetFilterListSelectHdl( LINK( this, SvtFileDialog, FilterSelectHdl_Impl ) );
+    _pImp->_pEdFileName->SetGetFocusHdl( LINK( this, SvtFileDialog, FileNameGetFocusHdl_Impl ) );
+    _pImp->_pEdFileName->SetModifyHdl( LINK( this, SvtFileDialog, FileNameModifiedHdl_Impl ) );
+    _pImp->_pEdCurrentPath->SetOpenHdl ( LINK( this, SvtFileDialog, URLBoxModifiedHdl_Impl ) );
+    _pImp->_pBtnConnectToServer->SetClickHdl( LINK ( this, SvtFileDialog, ConnectToServerPressed_Hdl ) );
 
 
     _pFileView->SetSelectHdl( LINK( this, SvtFileDialog, SelectHdl_Impl ) );
@@ -630,7 +630,7 @@ void SvtFileDialog::Init_Impl
 
     // set timer for the filterbox travel
     _pImp->_aFilterTimer.SetTimeout( TRAVELFILTER_TIMEOUT );
-    _pImp->_aFilterTimer.SetTimeoutHdl( STATIC_LINK( this, SvtFileDialog, FilterSelectHdl_Impl ) );
+    _pImp->_aFilterTimer.SetTimeoutHdl( LINK( this, SvtFileDialog, FilterSelectHdl_Impl ) );
 
     if ( WB_SAVEAS & nStyle )
     {
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index dae10bd5a45b..31105e7ddb08 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -411,7 +411,7 @@ void AddonsOptions_Impl::ReadConfigurationData()
 
 void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ )
 {
-    Application::PostUserEvent( STATIC_LINK( 0, AddonsOptions, Notify ) );
+    Application::PostUserEvent( LINK( 0, AddonsOptions, Notify ) );
 }
 
 //  public method
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 05f1d1c27a44..220024924481 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -124,7 +124,7 @@ throw ( RuntimeException, std::exception )
         pExecuteInfo->xDispatch     = xDispatch;
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = aArgs;
-        Application::PostUserEvent( STATIC_LINK(0, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo );
+        Application::PostUserEvent( LINK(0, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo );
     }
 }
 
@@ -260,7 +260,7 @@ void ComplexToolbarController::addNotifyInfo(
         aInfoSeq[nCount].Value = uno::makeAny( getFrameInterface() );
         pNotifyInfo->aInfoSeq  = aInfoSeq;
 
-        Application::PostUserEvent( STATIC_LINK(0, ComplexToolbarController, Notify_Impl), pNotifyInfo );
+        Application::PostUserEvent( LINK(0, ComplexToolbarController, Notify_Impl), pNotifyInfo );
     }
 }
 
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 7bf96258312d..500f525cc223 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -172,7 +172,7 @@ throw ( RuntimeException, std::exception )
         pExecuteInfo->xDispatch     = xDispatch;
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = aArgs;
-        Application::PostUserEvent( STATIC_LINK(0, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo );
+        Application::PostUserEvent( LINK(0, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo );
     }
 }
 
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 2c168d1e1833..b64813ef1e39 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -134,7 +134,7 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc
         ExecuteInfo* pExecuteInfo = new ExecuteInfo;
         pExecuteInfo->xDispatch     = xDispatch;
         pExecuteInfo->aTargetURL    = aTargetURL;
-        Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo );
+        Application::PostUserEvent( LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo );
     }
 }
 
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index c02f1f11674e..dd77e27a0a54 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -435,7 +435,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent
         pNewDocument->xDispatch  = xDispatch;
         pNewDocument->aTargetURL = aTargetURL;
         pNewDocument->aArgSeq    = aArgsList;
-        Application::PostUserEvent( STATIC_LINK(0, NewMenuController, ExecuteHdl_Impl), pNewDocument );
+        Application::PostUserEvent( LINK(0, NewMenuController, ExecuteHdl_Impl), pNewDocument );
     }
 }
 
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 7f1bf6450aef..ee6e7e4ad775 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -285,7 +285,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
         pLoadRecentFile->aTargetURL = aTargetURL;
         pLoadRecentFile->aArgSeq    = aArgsList;
 
-        Application::PostUserEvent( STATIC_LINK(0, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile );
+        Application::PostUserEvent( LINK(0, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile );
     }
 }
 
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 7455ca7c9c65..a517806eb6f4 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1878,7 +1878,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
                 pExecuteInfo->nCmd            = EXEC_CMD_DOCKTOOLBAR;
                 pExecuteInfo->xLayoutManager  = getLayoutManagerFromFrame( m_xFrame );
 
-                Application::PostUserEvent( STATIC_LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo );
+                Application::PostUserEvent( LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo );
                 break;
             }
 
@@ -1890,7 +1890,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
                 pExecuteInfo->nCmd            = EXEC_CMD_DOCKALLTOOLBARS;
                 pExecuteInfo->xLayoutManager  = getLayoutManagerFromFrame( m_xFrame );
 
-                Application::PostUserEvent( STATIC_LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo );
+                Application::PostUserEvent( LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo );
                 break;
             }
 
@@ -1918,7 +1918,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
                 pExecuteInfo->xLayoutManager  = getLayoutManagerFromFrame( m_xFrame );
                 pExecuteInfo->xWindow         = VCLUnoHelper::GetInterface( m_pToolBar );
 
-                Application::PostUserEvent( STATIC_LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo );
+                Application::PostUserEvent( LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo );
                 break;
             }
 
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index b95c2dc01414..bc197cef06ba 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -713,7 +713,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r
                     pExecuteInfo->xDispatch     = xDispatch;
                     pExecuteInfo->aTargetURL    = aTargetURL;
                     pExecuteInfo->aArgs         = aArgs;
-                    Application::PostUserEvent( STATIC_LINK(0, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo );
+                    Application::PostUserEvent( LINK(0, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo );
                 }
             }
             else
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index 43c7e0a6b330..8a9d1609a6fd 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -135,7 +135,7 @@ public:
     inline bool IsParserWorking() const { return SVPAR_WORKING == eState; }
 
     Link GetAsynchCallLink() const
-        { return STATIC_LINK( const_cast<SvParser*>(this), SvParser, NewDataRead ); }
+        { return LINK( const_cast<SvParser*>(this), SvParser, NewDataRead ); }
 
     long CallAsyncCallLink() { return NewDataRead( this, 0 ); }
 
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index b71b585ea8ca..e7116a02320e 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -72,8 +72,6 @@ typedef sal_IntPtr (*PSTUB)( void*, void* );
 #define LINK( Inst, Class, Member ) \
     Link( static_cast<Class*>(Inst), &Class::LinkStub##Member )
 
-#define STATIC_LINK( Inst, Class, Member ) LINK(Inst, Class, Member)
-
 #define IMPL_LINK( Class, Method, ArgType, ArgName ) \
     IMPL_STUB( Class, Method, ArgType ) \
     sal_IntPtr Class::Method( ArgType ArgName )
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 867d41cb43d5..58f875a0d97f 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -573,7 +573,7 @@ void ScContentTree::Command( const CommandEvent& rCEvt )
             //  den StarView MouseMove-Handler, der Command() aufruft, umbringen.
             //  Deshalb Drag&Drop asynchron:
 
-            Application::PostUserEvent( STATIC_LINK( this, ScContentTree, ExecDragHdl ) );
+            Application::PostUserEvent( LINK( this, ScContentTree, ExecDragHdl ) );
 
             bDone = true;
             break;
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index ce2080a5effe..5a59c2c8411f 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -898,7 +898,7 @@ void ScPreview::DoInvalidate()
     //  The Invalidate must come behind asynchronously
 
    if (bInGetState)
-        Application::PostUserEvent( STATIC_LINK( this, ScPreview, InvalidateHdl ) );
+        Application::PostUserEvent( LINK( this, ScPreview, InvalidateHdl ) );
     else
         StaticInvalidate();     // Immediately
 }
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 5e358bf35578..5bcd8818f0d1 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1169,7 +1169,7 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
         // another document type), but that would kill the StarView MouseMove
         // Handler which is calling Command().
         // For this reason, Drag&Drop is asynchronous.
-        Application::PostUserEvent( STATIC_LINK( this, SdPageObjsTLB, ExecDragHdl ) );
+        Application::PostUserEvent( LINK( this, SdPageObjsTLB, ExecDragHdl ) );
     }
 }
 
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 8bbd1974e971..c8f8da897a18 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -51,7 +51,7 @@ SfxFilterMatcher& SfxApplication::GetFilterMatcher()
     if( !pAppData_Impl->pMatcher )
     {
         pAppData_Impl->pMatcher = new SfxFilterMatcher();
-        URIHelper::SetMaybeFileHdl( STATIC_LINK(
+        URIHelper::SetMaybeFileHdl( LINK(
             pAppData_Impl->pMatcher, SfxFilterMatcher, MaybeFileHdl_Impl ) );
     }
     return *pAppData_Impl->pMatcher;
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 0d8f3a03a68b..278034ceee0c 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -268,7 +268,7 @@ bool SvFileObject::LoadFile_Impl()
 
         SfxMediumRef xTmpMed = xMed;
         bInCallDownload = true;
-        xMed->Download( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
+        xMed->Download( LINK( this, SvFileObject, LoadGrfReady_Impl ) );
         bInCallDownload = false;
 
         bClearMedium = !xMed.Is();
@@ -488,7 +488,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
             pThis->xMed->SetDoneLink( Link() );
             pThis->pDelMed = new SfxMediumRef(pThis->xMed);
             pThis->nPostUserEventId = Application::PostUserEvent(
-                        STATIC_LINK( pThis, SvFileObject, DelMedium_Impl ),
+                        LINK( pThis, SvFileObject, DelMedium_Impl ),
                         pThis->pDelMed);
             pThis->xMed.Clear();
         }
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 11aecd90473f..110fe238dc9f 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -85,9 +85,9 @@ SvDDELinkEditDialog::SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* pLin
     m_pEdDdeTopic->SetText( sTopic );
     m_pEdDdeItem->SetText( sItem );
 
-    m_pEdDdeApp->SetModifyHdl( STATIC_LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
-    m_pEdDdeTopic->SetModifyHdl( STATIC_LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
-    m_pEdDdeItem->SetModifyHdl( STATIC_LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
+    m_pEdDdeApp->SetModifyHdl( LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
+    m_pEdDdeTopic->SetModifyHdl( LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
+    m_pEdDdeItem->SetModifyHdl( LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
 
     m_pOKButton->Enable( !sServer.isEmpty() && !sTopic.isEmpty() && !sItem.isEmpty() );
 }
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 146357287bff..6e573e5a3391 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -359,7 +359,7 @@ void ShutdownIcon::StartFileDialog()
         m_pFileDlg = new FileDialogHelper(
                 ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
                 SFXWB_MULTISELECTION, OUString() );
-    m_pFileDlg->StartExecuteModal( STATIC_LINK( this, ShutdownIcon, DialogClosedHdl_Impl ) );
+    m_pFileDlg->StartExecuteModal( LINK( this, ShutdownIcon, DialogClosedHdl_Impl ) );
 }
 
 
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index d5da3ca8abb4..69c4a545505c 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -219,7 +219,7 @@ void RecentDocsViewItem::OpenDocument()
         pLoadRecentFile->aTargetURL = aTargetURL;
         pLoadRecentFile->aArgSeq = aArgsList;
 
-        Application::PostUserEvent(STATIC_LINK(0, RecentDocsView, ExecuteHdl_Impl), pLoadRecentFile);
+        Application::PostUserEvent(LINK(0, RecentDocsView, ExecuteHdl_Impl), pLoadRecentFile);
     }
 }
 
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index c0b2a35bafee..8568ac54906a 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -107,7 +107,7 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta
             }
             //not necessary if the last event is still on the way
             if(!nUserEventId)
-                nUserEventId = Application::PostUserEvent( STATIC_LINK(
+                nUserEventId = Application::PostUserEvent( LINK(
                             this, SfxTemplateControllerItem, SetWaterCanStateHdl_Impl ) );
             break;
         }
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 81f89fbf3aa3..e5d4fb020037 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -127,7 +127,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ )
             pExecuteInfo->xDispatch     = xDispatch;
             pExecuteInfo->aTargetURL    = aTargetURL;
             pExecuteInfo->aArgs         = aArgs;
-            Application::PostUserEvent( STATIC_LINK( 0, SfxURLToolBoxControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
+            Application::PostUserEvent( LINK( 0, SfxURLToolBoxControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
         }
     }
 }
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index b6785b958416..3b52c6b3f86c 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -451,7 +451,7 @@ sal_IntPtr Select_Impl( void* /*pHdl*/, void* pVoid )
         pExecuteInfo->xDispatch     = xDisp;
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = Sequence< PropertyValue >();
-        Application::PostUserEvent( STATIC_LINK( 0, SfxAppMenuControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
+        Application::PostUserEvent( LINK( 0, SfxAppMenuControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
     }
 
     return sal_True;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 5cda42ef38dc..ab14264ee890 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -205,7 +205,7 @@ void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /*
     // root for many deadlocks, especially in conjunction with the "Windows"
     // based single thread apartment clipboard code!
     AsyncExecuteInfo* pInfo = new AsyncExecuteInfo( ASYNCEXECUTE_CMD_DISPOSING, xThis, this );
-    Application::PostUserEvent( STATIC_LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
+    Application::PostUserEvent( LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
 }
 
 void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::clipboard::ClipboardEvent& )
@@ -216,7 +216,7 @@ void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::c
     // based single thread apartment clipboard code!
     uno::Reference< datatransfer::clipboard::XClipboardListener > xThis( static_cast< datatransfer::clipboard::XClipboardListener* >( this ));
     AsyncExecuteInfo* pInfo = new AsyncExecuteInfo( ASYNCEXECUTE_CMD_CHANGEDCONTENTS, xThis, this );
-    Application::PostUserEvent( STATIC_LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
+    Application::PostUserEvent( LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
 }
 
 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 341928408f13..d4073ac8b0b2 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3688,7 +3688,7 @@ void SvNumberFormatter::ImpInitCurrencyTable()
                 "SvNumberFormatter::ImpInitCurrencyTable: system currency not in I18N locale data.");
     }
     pLocaleData.reset();
-    SvtSysLocaleOptions::SetCurrencyChangeLink( STATIC_LINK( NULL, SvNumberFormatter, CurrencyChangeLink ) );
+    SvtSysLocaleOptions::SetCurrencyChangeLink( LINK( NULL, SvNumberFormatter, CurrencyChangeLink ) );
     bInitializing = false;
     bCurrencyTableInitialized = true;
 }
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index a6247190ccb8..c8a7802ffd0e 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1419,7 +1419,7 @@ IMPL_STATIC_LINK( SvTreeListBox, DragFinishHdl_Impl, sal_Int8*, pAction )
 Link SvTreeListBox::GetDragFinishedHdl() const
 {
     AddBoxToDDList_Impl( *this );
-    return STATIC_LINK( const_cast<SvTreeListBox*>(this), SvTreeListBox, DragFinishHdl_Impl );
+    return LINK( const_cast<SvTreeListBox*>(this), SvTreeListBox, DragFinishHdl_Impl );
 }
 
 /*
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 74225829cf8e..87e30ec3c7f1 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -56,7 +56,7 @@ bAllowDoubles
             {
                 _pIdle = new Idle;
                 _pIdle->SetPriority( SchedulerPriority::HIGHEST );
-                _pIdle->SetIdleHdl( STATIC_LINK(
+                _pIdle->SetIdleHdl( LINK(
                     this, AsynchronLink, HandleCall) );
             }
             _pIdle->Start();
@@ -64,7 +64,7 @@ bAllowDoubles
         else
         {
             if( _pMutex ) _pMutex->acquire();
-            _nEventId = Application::PostUserEvent( STATIC_LINK( this, AsynchronLink, HandleCall), 0 );
+            _nEventId = Application::PostUserEvent( LINK( this, AsynchronLink, HandleCall), 0 );
             if( _pMutex ) _pMutex->release();
         }
     }
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 6fca550f6f0a..ba2eac4b0959 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -218,7 +218,7 @@ void Calendar::ImplInit( WinBits nWinStyle )
     for (sal_Int32 i = 0; i < 31; ++i)
         maDayTexts[i] = OUString::number(i+1);
 
-    maDragScrollTimer.SetTimeoutHdl( STATIC_LINK( this, Calendar, ScrollHdl ) );
+    maDragScrollTimer.SetTimeoutHdl( LINK( this, Calendar, ScrollHdl ) );
     maDragScrollTimer.SetTimeout( GetSettings().GetMouseSettings().GetScrollRepeat() );
     mnDragScrollHitTest = 0;
 
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 370a1f97eaab..7f95b5d113cc 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -129,7 +129,7 @@ namespace
 SvtMatchContext_Impl::SvtMatchContext_Impl(
     SvtURLBox* pBoxP, const OUString& rText )
     : Thread( "SvtMatchContext_Impl" )
-    , aLink( STATIC_LINK( this, SvtMatchContext_Impl, Select_Impl ) )
+    , aLink( LINK( this, SvtMatchContext_Impl, Select_Impl ) )
     , aBaseURL( pBoxP->aBaseURL )
     , aText( rText )
     , pBox( pBoxP )
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index 08716455213a..54fe1975acb0 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -93,7 +93,7 @@ void MainThreadFrameCloserRequest::Start( MainThreadFrameCloserRequest* pMTReque
             worker( NULL, pMTRequest );
         }
         else
-            Application::PostUserEvent( STATIC_LINK( NULL, MainThreadFrameCloserRequest, worker ), pMTRequest );
+            Application::PostUserEvent( LINK( NULL, MainThreadFrameCloserRequest, worker ), pMTRequest );
     }
 }
 
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index 943c2d868fd8..e46adf6d71cb 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -367,7 +367,7 @@ ContextMenuHelper::dispatchCommand(
         pExecuteInfo->aTargetURL   = aTargetURL;
         pExecuteInfo->aArgs        = m_aDefaultArgs;
 
-        Application::PostUserEvent( STATIC_LINK(0, ContextMenuHelper , ExecuteHdl_Impl), pExecuteInfo );
+        Application::PostUserEvent( LINK(0, ContextMenuHelper , ExecuteHdl_Impl), pExecuteInfo );
         return true;
     }
 
diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx
index 04e6203477a4..f0a50647a1e6 100644
--- a/svtools/source/uno/generictoolboxcontroller.cxx
+++ b/svtools/source/uno/generictoolboxcontroller.cxx
@@ -119,7 +119,7 @@ throw ( RuntimeException, std::exception )
         pExecuteInfo->xDispatch     = xDispatch;
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = aArgs;
-        Application::PostUserEvent( STATIC_LINK(0, GenericToolboxController , ExecuteHdl_Impl), pExecuteInfo );
+        Application::PostUserEvent( LINK(0, GenericToolboxController , ExecuteHdl_Impl), pExecuteInfo );
     }
 }
 
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index 0e89ae17b6c5..9e2090a52dd6 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -147,7 +147,7 @@ void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, cons
 
         Reference< XDispatch > xDispatch( xDispatchProvider->queryDispatch( aURL, OUString(), 0 ), UNO_QUERY_THROW );
 
-        Application::PostUserEvent( STATIC_LINK(0, PopupMenuControllerBase, ExecuteHdl_Impl), new PopupMenuControllerBaseDispatchInfo( xDispatch, aURL, rArgs ) );
+        Application::PostUserEvent( LINK(0, PopupMenuControllerBase, ExecuteHdl_Impl), new PopupMenuControllerBaseDispatchInfo( xDispatch, aURL, rArgs ) );
 
     }
     catch( Exception& )
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index 82f61e3b9e49..b3a63698ee79 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -68,7 +68,7 @@ void PopupWindowControllerImpl::SetPopupWindow( vcl::Window* pPopupWindow, ToolB
     if( mpPopupWindow )
     {
         mpPopupWindow->RemoveEventListener( LINK( this, PopupWindowControllerImpl, WindowEventListener ) );
-        Application::PostUserEvent( STATIC_LINK( this, PopupWindowControllerImpl, AsyncDeleteWindowHdl ), mpPopupWindow );
+        Application::PostUserEvent( LINK( this, PopupWindowControllerImpl, AsyncDeleteWindowHdl ), mpPopupWindow );
     }
     mpPopupWindow = pPopupWindow;
     mpToolBox = pToolBox;
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 86ed9a7ccdf4..afdde4d52509 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -688,7 +688,7 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ
         Reference< XDispatch > xDispatch( xDispatchProvider->queryDispatch( aURL, sTarget, 0 ), UNO_QUERY_THROW );
 
         DispatchInfo *pDispatchInfo = new DispatchInfo( xDispatch, aURL, rArgs );
-        if ( !Application::PostUserEvent( STATIC_LINK(0, ToolboxController, ExecuteHdl_Impl),
+        if ( !Application::PostUserEvent( LINK(0, ToolboxController, ExecuteHdl_Impl),
                                           pDispatchInfo ) )
             delete pDispatchInfo;
 
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 80d5d6b308b8..e695c6d8b79f 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -226,7 +226,7 @@ void GalleryThemePopup::Execute(
         pInfo->Dispatch = rCmdInfo.Dispatch;
 
         if ( !Application::PostUserEvent(
-                STATIC_LINK( 0, GalleryBrowser2, AsyncDispatch_Impl), pInfo ) )
+                LINK( 0, GalleryBrowser2, AsyncDispatch_Impl), pInfo ) )
             delete pInfo;
     }
 }
@@ -1133,7 +1133,7 @@ void GalleryBrowser2::Dispatch(
             pInfo->Dispatch = xDispatch;
 
             if ( !Application::PostUserEvent(
-                    STATIC_LINK( 0, GalleryBrowser2, AsyncDispatch_Impl), pInfo ) )
+                    LINK( 0, GalleryBrowser2, AsyncDispatch_Impl), pInfo ) )
                 delete pInfo;
         }
         break;
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 23c743ca9d4e..cabf37f9e717 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -147,7 +147,7 @@ void SvxColorValueSet_docking::Command(const CommandEvent& rCEvt)
 
 void SvxColorValueSet_docking::StartDrag( sal_Int8 , const Point&  )
 {
-    Application::PostUserEvent(STATIC_LINK(this, SvxColorValueSet_docking, ExecDragHdl));
+    Application::PostUserEvent(LINK(this, SvxColorValueSet_docking, ExecDragHdl));
 }
 
 void SvxColorValueSet_docking::DoDrag()
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index a234b819c7aa..3f2412de76a6 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -221,7 +221,7 @@ SwHTMLTableLayout::SwHTMLTableLayout( const SwTable * pSwTbl,
     , bMustNotResize( false )
     , bMustNotRecalc( false )
 {
-    aResizeTimer.SetTimeoutHdl( STATIC_LINK( this, SwHTMLTableLayout,
+    aResizeTimer.SetTimeoutHdl( LINK( this, SwHTMLTableLayout,
                                              DelayedResize_Impl ) );
 }
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 78588cfcfb3c..2f537111ad23 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1987,7 +1987,7 @@ void DrawGraphic(
                 const_cast<SvxBrushItem*>(pBrush)->SetDoneLink( Link() );
             }
             else
-                const_cast<SvxBrushItem*>(pBrush)->SetDoneLink( STATIC_LINK(
+                const_cast<SvxBrushItem*>(pBrush)->SetDoneLink( LINK(
                                     rSh.GetDoc(), SwDoc, BackgroundDone ) );
             OUString referer;
             SfxObjectShell * sh = rSh.GetDoc()->GetPersist();
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 13464804fa21..72f201c365f9 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -254,7 +254,7 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare
 
     m_pStopPB->SetClickHdl(LINK(this, SwTestAccountSettingsDialog, StopHdl));
 
-    Application::PostUserEvent( STATIC_LINK( this, SwTestAccountSettingsDialog, TestHdl ), this );
+    Application::PostUserEvent( LINK( this, SwTestAccountSettingsDialog, TestHdl ), this );
 }
 
 SwTestAccountSettingsDialog::~SwTestAccountSettingsDialog()
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index e69a4ead6fb0..1a0f818244b6 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -474,7 +474,7 @@ IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton)
 IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl)
 {
     SvTreeListEntry* pSelect = m_pListLB->FirstSelected();
-    Application::PostUserEvent( STATIC_LINK( this, SwAddressListDialog,
+    Application::PostUserEvent( LINK( this, SwAddressListDialog,
                                                 StaticListBoxSelectHdl_Impl ), pSelect );
     return 0;
 }
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index e15e757421e7..28920d03090f 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -540,7 +540,7 @@ void  SwSendMailDialog::IterateMails()
 
 void SwSendMailDialog::ShowDialog()
 {
-    Application::PostUserEvent( STATIC_LINK( this, SwSendMailDialog,
+    Application::PostUserEvent( LINK( this, SwSendMailDialog,
                                                 StartSendMails ), this );
     ModelessDialog::Show();
 }
@@ -550,7 +550,7 @@ void  SwSendMailDialog::StateChanged( StateChangedType nStateChange )
     ModelessDialog::StateChanged( nStateChange );
     if(StateChangedType::VISIBLE == nStateChange && !IsVisible())
     {
-        m_pImpl->aRemoveIdle.SetIdleHdl( STATIC_LINK( this, SwSendMailDialog,
+        m_pImpl->aRemoveIdle.SetIdleHdl( LINK( this, SwSendMailDialog,
                                                     RemoveThis ) );
         m_pImpl->aRemoveIdle.Start();
     }
@@ -564,7 +564,7 @@ void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> xMessag
     if(pError &&
         m_pImpl->xMailDispatcher.is() && m_pImpl->xMailDispatcher->isStarted())
     {
-        Application::PostUserEvent( STATIC_LINK( this, SwSendMailDialog,
+        Application::PostUserEvent( LINK( this, SwSendMailDialog,
                                                     StopSendMails ), this );
     }
     Image aInsertImg = m_aImageList.GetImage( bResult ? FN_FORMULA_APPLY : FN_FORMULA_CANCEL );
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 97c7c2e6fc35..aa8e2c95beea 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -2585,7 +2585,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
                     pSect->SetLinkFileName( sFileURL );
                     pSect->SetProtectFlag( true );
 
-                    Application::PostUserEvent( STATIC_LINK( &rSh, SwWrtShell,
+                    Application::PostUserEvent( LINK( &rSh, SwWrtShell,
                                                 InsertRegionDialog ), pSect );
                     nRet = true;
                     }
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index eb45bc4ceea9..cb7d2c778a27 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -154,7 +154,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
                     pNew->xCursor               = xCursor;
                     pNew->xConnection           = xConnection;
 
-                    Application::PostUserEvent( STATIC_LINK( this, SwBaseShell,
+                    Application::PostUserEvent( LINK( this, SwBaseShell,
                                             InsertDBTextHdl ), pNew );
                     // the pNew will be removed in InsertDBTextHdl !!
                 }
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 83586ec227f1..ac264eca208d 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1063,7 +1063,7 @@ void SwView::Execute(SfxRequest &rReq)
             if (nSlot == FN_SCROLL_PREV)
                 *pbNext = false;
             // #i75416# move the execution of the search to an asynchronously called static link
-            Application::PostUserEvent( STATIC_LINK(this, SwView, MoveNavigationHdl), pbNext );
+            Application::PostUserEvent( LINK(this, SwView, MoveNavigationHdl), pbNext );
         }
         break;
         case FN_NAVIGATION_POPUP:
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 559b9ff747b7..a39bdd5b2128 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -740,7 +740,7 @@ bool SwView::ExecSpellPopup(const Point& rPt)
                                     pExecuteInfo->xDispatch     = xDispatch;
                                     pExecuteInfo->aTargetURL    = aURL;
                                     pExecuteInfo->aArgs         = aArgs;
-                                    Application::PostUserEvent( STATIC_LINK(0, AsyncExecute , ExecuteHdl_Impl), pExecuteInfo );
+                                    Application::PostUserEvent( LINK(0, AsyncExecute , ExecuteHdl_Impl), pExecuteInfo );
                                 }
                             }
                             catch (const Exception&)
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 5c5a1aa75d93..a3fc721718d9 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -1180,7 +1180,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont)
         {
             bFound = true;
             SwGlobalTree::SetShowShell(pCurr);
-            Application::PostUserEvent( STATIC_LINK(
+            Application::PostUserEvent( LINK(
                         this, SwGlobalTree, ShowFrameHdl ) );
             pCurr = 0;
         }
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index b23fbb88f3b3..70c506f138f1 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -217,7 +217,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
         {
             // #i75416# move the execution of the search to an asynchronously called static link
             bool* pbNext = new bool( FN_DOWN == nCurrItemId );
-            Application::PostUserEvent( STATIC_LINK(pView, SwView, MoveNavigationHdl), pbNext );
+            Application::PostUserEvent( LINK(pView, SwView, MoveNavigationHdl), pbNext );
         }
         break;
         case FN_SHOW_ROOT:
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index c27f22fb5c0b..fe4823d4cd27 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -67,7 +67,7 @@ void test_init_impl(bool bAssertOnDialog, bool bNeedUCB,
 
     // Make GraphicConverter work, normally done in desktop::Desktop::Main()
     Application::SetFilterHdl(
-            STATIC_LINK(0, test::BootstrapFixture, ImplInitFilterHdl));
+            LINK(0, test::BootstrapFixture, ImplInitFilterHdl));
 
     if (bNeedUCB)
     {
diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx
index b15ed9651a52..b2991b1de898 100644
--- a/test/source/vclbootstrapprotector.cxx
+++ b/test/source/vclbootstrapprotector.cxx
@@ -43,7 +43,7 @@ public:
         if (test::isHeadless()) {
             Application::EnableHeadlessMode(true);
         }
-        Application::setDeInitHook(STATIC_LINK(this, Protector, deinitHook));
+        Application::setDeInitHook(LINK(this, Protector, deinitHook));
     }
 
 private:
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index 700580312477..889ee80f04ee 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -92,7 +92,7 @@ void SAL_CALL AsyncCallback::addCallback(const css::uno::Reference< css::awt::XC
         SolarMutexGuard aSolarGuard;
 
         CallbackData* pCallbackData = new CallbackData( xCallback, aData );
-        Application::PostUserEvent( STATIC_LINK( this, AsyncCallback, Notify_Impl ), pCallbackData );
+        Application::PostUserEvent( LINK( this, AsyncCallback, Notify_Impl ), pCallbackData );
     }
 }
 
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 05dfc4003351..c0d5751495ef 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -1337,7 +1337,7 @@ void PrinterUpdate::update(SalGenericInstance &rInstance)
     {
         pPrinterUpdateIdle = new Idle();
         pPrinterUpdateIdle->SetPriority( SchedulerPriority::LOWEST );
-        pPrinterUpdateIdle->SetIdleHdl( STATIC_LINK( NULL, PrinterUpdate, UpdateTimerHdl ) );
+        pPrinterUpdateIdle->SetIdleHdl( LINK( NULL, PrinterUpdate, UpdateTimerHdl ) );
         pPrinterUpdateIdle->Start();
     }
 }
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 7859ccc370c4..ca3539306540 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -390,7 +390,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ImplSVAppData, ImplQuitMsg, void*, EMPTYARG )
 
 void Application::Quit()
 {
-    Application::PostUserEvent( STATIC_LINK( NULL, ImplSVAppData, ImplQuitMsg ) );
+    Application::PostUserEvent( LINK( NULL, ImplSVAppData, ImplQuitMsg ) );
 }
 
 comphelper::SolarMutex& Application::GetSolarMutex()
@@ -695,7 +695,7 @@ ImplSVEvent * Application::PostKeyEvent( sal_uLong nEvent, vcl::Window *pWin, Ke
         ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, *pKeyEvent );
 
         nEventId = PostUserEvent(
-                       STATIC_LINK( NULL, Application, PostEventHandler ),
+                       LINK( NULL, Application, PostEventHandler ),
                        pPostEventData );
 
         if( nEventId )
@@ -728,7 +728,7 @@ ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin,
         ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, aTransformedEvent );
 
         nEventId = PostUserEvent(
-                       STATIC_LINK( NULL, Application, PostEventHandler ),
+                       LINK( NULL, Application, PostEventHandler ),
                        pPostEventData );
 
         if( nEventId )
@@ -762,7 +762,7 @@ ImplSVEvent * Application::PostZoomEvent( sal_uLong nEvent, vcl::Window *pWin, Z
         ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, aTransformedEvent );
 
         nEventId = PostUserEvent(
-                       STATIC_LINK( NULL, Application, PostEventHandler ),
+                       LINK( NULL, Application, PostEventHandler ),
                        pPostEventData );
 
         if( nEventId )
@@ -787,7 +787,7 @@ ImplSVEvent * Application::PostScrollEvent( sal_uLong nEvent, vcl::Window *pWin,
         ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, *pScrollEvent );
 
         nEventId = PostUserEvent(
-                       STATIC_LINK( NULL, Application, PostEventHandler ),
+                       LINK( NULL, Application, PostEventHandler ),
                        pPostEventData );
 
         if( nEventId )
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 750b8b79f867..96107dcacf54 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -341,7 +341,7 @@ void SessionManagerClient::SaveYourselfProc(
     }
     // Smuggle argument in as void*:
     sal_uIntPtr nStateVal = shutdown;
-    Application::PostUserEvent( STATIC_LINK( 0, SessionManagerClient, SaveYourselfHdl ), reinterpret_cast< void * >(nStateVal) );
+    Application::PostUserEvent( LINK( 0, SessionManagerClient, SaveYourselfHdl ), reinterpret_cast< void * >(nStateVal) );
     SAL_INFO("vcl.sm", "waiting for save yourself event to be processed" );
 }
 
@@ -368,7 +368,7 @@ void SessionManagerClient::DieProc(
     SAL_INFO("vcl.sm", "Session: die");
     if( connection == m_pSmcConnection )
     {
-        Application::PostUserEvent( STATIC_LINK( NULL, SessionManagerClient, ShutDownHdl ) );
+        Application::PostUserEvent( LINK( NULL, SessionManagerClient, ShutDownHdl ) );
         SAL_INFO("vcl.sm", "waiting for shutdown event to be processed" );
     }
 }
@@ -387,7 +387,7 @@ void SessionManagerClient::ShutdownCanceledProc(
 {
     SAL_INFO("vcl.sm", "Session: shutdown canceled" );
     if( connection == m_pSmcConnection )
-        Application::PostUserEvent( STATIC_LINK( NULL, SessionManagerClient, ShutDownCancelHdl ) );
+        Application::PostUserEvent( LINK( NULL, SessionManagerClient, ShutDownCancelHdl ) );
 }
 
 void SessionManagerClient::InteractProc(
@@ -396,7 +396,7 @@ void SessionManagerClient::InteractProc(
 {
     SAL_INFO("vcl.sm", "Session: interaction request completed" );
     if( connection == m_pSmcConnection )
-        Application::PostUserEvent( STATIC_LINK( NULL, SessionManagerClient, InteractionHdl ) );
+        Application::PostUserEvent( LINK( NULL, SessionManagerClient, InteractionHdl ) );
 }
 
 void SessionManagerClient::saveDone()