Replace IMPL_STATIC_LINK[_TYPED] with more useful variants

Change-Id: I1b3bf6ac16346ecf6085874d80ac6495e773dd37

3 files changed, 33 insertions, 34 deletions

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index c571832e0207..325f6f346c88 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -441,33 +441,33 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent
 /* Initialize, asynchronous to prevent virtial calls
    from a constructor
  */
-IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG )
+IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG )
 {
-    pThis->SetUpdateMode( false );
+    SetUpdateMode( false );
     //show or hide AutoCorrect depending on the modules abilities
-    pThis->m_pAutoCorrPB->Show(pThis->rParent.HasAutoCorrection());
-    pThis->SpellContinue_Impl();
-    pThis->m_pSentenceED->ResetUndo();
-    pThis->m_pUndoPB->Enable(false);
+    m_pAutoCorrPB->Show(rParent.HasAutoCorrection());
+    SpellContinue_Impl();
+    m_pSentenceED->ResetUndo();
+    m_pUndoPB->Enable(false);
 
     // get current language
-    pThis->UpdateBoxes_Impl();
+    UpdateBoxes_Impl();
 
     // fill dictionary PopupMenu
-    pThis->InitUserDicts();
-
-    pThis->LockFocusChanges(true);
-    if( pThis->m_pChangePB->IsEnabled() )
-        pThis->m_pChangePB->GrabFocus();
-    else if( pThis->m_pIgnorePB->IsEnabled() )
-        pThis->m_pIgnorePB->GrabFocus();
-    else if( pThis->m_pClosePB->IsEnabled() )
-        pThis->m_pClosePB->GrabFocus();
-    pThis->LockFocusChanges(false);
+    InitUserDicts();
+
+    LockFocusChanges(true);
+    if( m_pChangePB->IsEnabled() )
+        m_pChangePB->GrabFocus();
+    else if( m_pIgnorePB->IsEnabled() )
+        m_pIgnorePB->GrabFocus();
+    else if( m_pClosePB->IsEnabled() )
+        m_pClosePB->GrabFocus();
+    LockFocusChanges(false);
     //show grammar CheckBox depending on the modules abilities
-    pThis->m_pCheckGrammarCB->Check( pThis->rParent.IsGrammarChecking() );
-    pThis->SetUpdateMode( true );
-    pThis->Show();
+    m_pCheckGrammarCB->Check( rParent.IsGrammarChecking() );
+    SetUpdateMode( true );
+    Show();
     return 0;
 };
 
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 00ca41532978..d48e043b382f 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -739,22 +739,22 @@ short SfxInsertFloatingFrameDialog::Execute()
 
 
 
-IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB )
+IMPL_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB )
 {
-    if ( pCB == pThis->m_pCBMarginWidthDefault )
+    if ( pCB == m_pCBMarginWidthDefault )
     {
         if ( pCB->IsChecked() )
-            pThis->m_pNMMarginWidth->SetText( OUString::number(DEFAULT_MARGIN_WIDTH) );
-        pThis->m_pFTMarginWidth->Enable( !pCB->IsChecked() );
-        pThis->m_pNMMarginWidth->Enable( !pCB->IsChecked() );
+            m_pNMMarginWidth->SetText( OUString::number(DEFAULT_MARGIN_WIDTH) );
+        m_pFTMarginWidth->Enable( !pCB->IsChecked() );
+        m_pNMMarginWidth->Enable( !pCB->IsChecked() );
     }
 
-    if ( pCB == pThis->m_pCBMarginHeightDefault )
+    if ( pCB == m_pCBMarginHeightDefault )
     {
         if ( pCB->IsChecked() )
-            pThis->m_pNMMarginHeight->SetText( OUString::number(DEFAULT_MARGIN_HEIGHT) );
-        pThis->m_pFTMarginHeight->Enable( !pCB->IsChecked() );
-        pThis->m_pNMMarginHeight->Enable( !pCB->IsChecked() );
+            m_pNMMarginHeight->SetText( OUString::number(DEFAULT_MARGIN_HEIGHT) );
+        m_pFTMarginHeight->Enable( !pCB->IsChecked() );
+        m_pNMMarginHeight->Enable( !pCB->IsChecked() );
     }
 
     return 0L;
@@ -762,10 +762,10 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB )
 
 
 
-IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG )
+IMPL_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG )
 {
     vcl::Window* pOldParent = Application::GetDefDialogParent();
-    Application::SetDefDialogParent( pThis );
+    Application::SetDefDialogParent( this );
 
     // create the file dialog
     sfx2::FileDialogHelper aFileDlg(
@@ -776,7 +776,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG )
 
     // show the dialog
     if ( aFileDlg.Execute() == ERRCODE_NONE )
-        pThis->m_pEDURL->SetText(
+        m_pEDURL->SetText(
             INetURLObject( aFileDlg.GetPath() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ) );
 
     Application::SetDefDialogParent( pOldParent );
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index aa58d7145858..81e7c7347b05 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -437,9 +437,8 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox
     return 0;
 }
 
-IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pBox )
+IMPL_STATIC_LINK_NOINSTANCE( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pBox )
 {
-    (void) pThis;
     if (pBox && pBox->GetEntryCount() >= 2)
         pBox->SelectEntryPos( 1 );  // pos 0 is a 'header' that is not selectable
     return 0;