Replace IMPL_STATIC_LINK[_TYPED] with more useful variants

Change-Id: I344ba9d22adada82170d45a4cf723af6a286b883

3 files changed, 25 insertions, 25 deletions

diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 2a86642c9eea..d9d5652502ad 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -81,17 +81,17 @@ AsynchronLink::~AsynchronLink()
     delete _pMutex;
 }
 
-IMPL_STATIC_LINK_TYPED( AsynchronLink, HandleCall_Idle, Idle*, EMPTYARG, void )
+IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_Idle, Idle*, void )
 {
-    if( pThis->_pMutex ) pThis->_pMutex->acquire();
-    pThis->_nEventId = 0;
-    if( pThis->_pMutex ) pThis->_pMutex->release();
-    pThis->Call_Impl( pThis->_pArg );
+    if( _pMutex ) _pMutex->acquire();
+    _nEventId = 0;
+    if( _pMutex ) _pMutex->release();
+    Call_Impl( _pArg );
 }
 
-IMPL_STATIC_LINK( AsynchronLink, HandleCall_PostUserEvent, void*, EMPTYARG )
+IMPL_LINK_NOARG( AsynchronLink, HandleCall_PostUserEvent )
 {
-    HandleCall_Idle(pThis, nullptr);
+    HandleCall_Idle(nullptr);
     return 0;
 }
 
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 6e08841f32e3..b435f906a5f3 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -1404,15 +1404,15 @@ void Calendar::ImplEndTracking( bool bCancel )
 
 
 
-IMPL_STATIC_LINK_TYPED( Calendar, ScrollHdl, Timer*, EMPTYARG, void )
+IMPL_LINK_NOARG_TYPED( Calendar, ScrollHdl, Timer*, void )
 {
-    bool bPrevIn = (pThis->mnDragScrollHitTest & CALENDAR_HITTEST_PREV) != 0;
-    bool bNextIn = (pThis->mnDragScrollHitTest & CALENDAR_HITTEST_NEXT) != 0;
+    bool bPrevIn = (mnDragScrollHitTest & CALENDAR_HITTEST_PREV) != 0;
+    bool bNextIn = (mnDragScrollHitTest & CALENDAR_HITTEST_NEXT) != 0;
     if( bNextIn || bPrevIn )
     {
-        pThis->mbScrollDateRange = true;
-        pThis->ImplScroll( bPrevIn );
-        pThis->mbScrollDateRange = false;
+        mbScrollDateRange = true;
+        ImplScroll( bPrevIn );
+        mbScrollDateRange = false;
     }
 }
 
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 7f95b5d113cc..4977d06419bb 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -106,7 +106,7 @@ class SvtMatchContext_Impl: public salhelper::Thread
     css::uno::Reference< css::ucb::XCommandProcessor > processor_;
     sal_Int32 commandId_;
 
-    DECL_STATIC_LINK(               SvtMatchContext_Impl, Select_Impl, void* );
+    DECL_LINK(                      Select_Impl, void* );
 
     virtual                         ~SvtMatchContext_Impl();
     virtual void                    execute() SAL_OVERRIDE;
@@ -207,18 +207,18 @@ void SvtMatchContext_Impl::execute( )
 // Cancellable does not discard the information gained so far, it
 // inserts all collected completions into the listbox.
 
-IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
+IMPL_LINK_NOARG( SvtMatchContext_Impl, Select_Impl )
 {
     // avoid recursion through cancel button
     {
-        osl::MutexGuard g(pThis->mutex_);
-        if (pThis->stopped_) {
+        osl::MutexGuard g(mutex_);
+        if (stopped_) {
             // Completion was stopped, no display:
             return 0;
         }
     }
 
-    SvtURLBox* pBox = pThis->pBox;
+    SvtURLBox* pBox = this->pBox;
     pBox->bAutoCompleteMode = true;
 
     // did we filter completions which otherwise would have been valid?
@@ -228,7 +228,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
     // insert all completed strings into the listbox
     pBox->Clear();
 
-    for(std::vector<OUString>::iterator i = pThis->aCompletions.begin(); i != pThis->aCompletions.end(); ++i)
+    for(std::vector<OUString>::iterator i = aCompletions.begin(); i != aCompletions.end(); ++i)
     {
         OUString sCompletion(*i);
 
@@ -259,19 +259,19 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
         pBox->InsertEntry( sCompletion );
     }
 
-    if( !pThis->bNoSelection && !pThis->aCompletions.empty() && !bValidCompletionsFiltered )
+    if( !bNoSelection && !aCompletions.empty() && !bValidCompletionsFiltered )
     {
         // select the first one
         OUString aTmp( pBox->GetEntry(0) );
         pBox->SetText( aTmp );
-        pBox->SetSelection( Selection( pThis->aText.getLength(), aTmp.getLength() ) );
+        pBox->SetSelection( Selection( aText.getLength(), aTmp.getLength() ) );
     }
 
     // transfer string lists to listbox and forget them
-    pBox->pImp->aURLs = pThis->aURLs;
-    pBox->pImp->aCompletions = pThis->aCompletions;
-    pThis->aURLs.clear();
-    pThis->aCompletions.clear();
+    pBox->pImp->aURLs = aURLs;
+    pBox->pImp->aCompletions = aCompletions;
+    aURLs.clear();
+    aCompletions.clear();
 
     // force listbox to resize ( it may be open )
     pBox->Resize();