Remove unnecessary IMPL_LINK[_NOARG]_INLINE_START/END

...just use IMPL_LINK[_NOARG] and let the compiler decide what to inline

Change-Id: I63ec5116df7e79093ebf31193f8c674f1351c0e6

24 files changed, 45 insertions, 90 deletions

diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index d0dea5ffafbc..7026d43d35f2 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -59,15 +59,14 @@ void SwBreakDlg::Apply()
     }
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, ClickHdl)
+IMPL_LINK_NOARG(SwBreakDlg, ClickHdl)
 {
     CheckEnable();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, ClickHdl)
 
 // Handler for Change Page Number
-IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
+IMPL_LINK( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
 {
     if(pBox->IsChecked())
         m_pPageNumEdit->SetValue(1);
@@ -75,15 +74,13 @@ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
         m_pPageNumEdit->SetText(OUString());
     return 0;
 }
-IMPL_LINK_INLINE_END( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
 
 // By changing the Page number the checkbox is checked.
-IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, PageNumModifyHdl)
+IMPL_LINK_NOARG(SwBreakDlg, PageNumModifyHdl)
 {
     m_pPageNumBox->Check();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, PageNumModifyHdl)
 
 /*
  * Ok-Handler;
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 0e024ab3cac6..691023c23b52 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -759,13 +759,12 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
     return 0;
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwDropCapsPage, SelectHdl)
+IMPL_LINK_NOARG(SwDropCapsPage, SelectHdl)
 {
     m_pPict->UpdatePaintSettings();
     bModified = true;
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwDropCapsPage, SelectHdl)
 
 void SwDropCapsPage::FillSet( SfxItemSet &rSet )
 {
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 84cf08a300f8..9764b8f22cb6 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -843,12 +843,11 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwCaptionOptPage, SelectHdl)
+IMPL_LINK_NOARG(SwCaptionOptPage, SelectHdl)
 {
     DrawSample();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwCaptionOptPage, SelectHdl)
 
 IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox )
 {
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 287429ba43e6..4b02931e58eb 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -503,7 +503,7 @@ void    SwAddPrinterTabPage::Reset( const SfxItemSet*  )
         m_pProspectCB_RTL->Enable( false );
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, AutoClickHdl)
+IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl)
 {
     bAttrModified = true;
     bool bIsProspect = m_pProspectCB->IsChecked();
@@ -517,7 +517,6 @@ IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, AutoClickHdl)
     m_pInMarginsRB->Enable( !bIsProspect );
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwAddPrinterTabPage, AutoClickHdl)
 
 void  SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
 {
@@ -529,12 +528,11 @@ void  SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
     m_pFaxLB->SelectEntryPos(0);
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, SelectHdl)
+IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl)
 {
     bAttrModified=true;
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwAddPrinterTabPage, SelectHdl)
 
 void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet)
 {
@@ -2603,12 +2601,11 @@ void SwTestTabPage::Init()
     m_pTest10CBox->SetClickHdl( aLk );
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwTestTabPage, AutoClickHdl)
+IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl)
 {
     bAttrModified = true;
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwTestTabPage, AutoClickHdl)
 
 #endif
 
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index a6d8a92ca48a..65a40c87b2d9 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1744,14 +1744,13 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
     return 0;
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwInsertSectionTabPage, NameEditHdl)
+IMPL_LINK_NOARG(SwInsertSectionTabPage, NameEditHdl)
 {
     const OUString aName = m_pCurName->GetText();
     GetTabDialog()->GetOKButton().Enable(!aName.isEmpty() &&
             m_pCurName->GetEntryPos( aName ) == LISTBOX_ENTRY_NOTFOUND);
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwInsertSectionTabPage, NameEditHdl)
 
 IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
 {
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 0fa73fb0171d..96c7e92e3b09 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -218,7 +218,7 @@ void SwEnvFmtPage::dispose()
 }
 
 
-IMPL_LINK_INLINE_START( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
+IMPL_LINK( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
 {
     long lWVal = static_cast< long >(GetFldVal(*m_pSizeWidthField ));
     long lHVal = static_cast< long >(GetFldVal(*m_pSizeHeightField));
@@ -253,7 +253,6 @@ IMPL_LINK_INLINE_START( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
     }
     return 0;
 }
-IMPL_LINK_INLINE_END( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
 
 IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
 {
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 8cf472141a12..267186efe9c4 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -365,12 +365,11 @@ IMPL_LINK_NOARG(SwLabPage, FieldHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwLabPage, PageHdl)
+IMPL_LINK_NOARG(SwLabPage, PageHdl)
 {
     m_pMakeBox->GetSelectHdl().Call(m_pMakeBox);
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwLabPage, PageHdl)
 
 IMPL_LINK_NOARG(SwLabPage, MakeHdl)
 {
@@ -426,13 +425,12 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwLabPage, TypeHdl)
+IMPL_LINK_NOARG(SwLabPage, TypeHdl)
 {
     DisplayFormat();
     aItem.aType = m_pTypeBox->GetSelectEntry();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwLabPage, TypeHdl)
 
 void SwLabPage::DisplayFormat()
 {
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 92e77b99effd..4a73392b0166 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -377,16 +377,15 @@ void SwLabFmtPage::dispose()
 
 
 // Modify-handler of MetricFields. start preview timer
-IMPL_LINK_NOARG_INLINE_START(SwLabFmtPage, ModifyHdl)
+IMPL_LINK_NOARG(SwLabFmtPage, ModifyHdl)
 {
     bModified = true;
     aPreviewIdle.Start();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwLabFmtPage, ModifyHdl)
 
 // Invalidate preview
-IMPL_LINK_NOARG_INLINE_START(SwLabFmtPage, PreviewHdl)
+IMPL_LINK_NOARG(SwLabFmtPage, PreviewHdl)
 {
     aPreviewIdle.Stop();
     ChangeMinMax();
@@ -395,16 +394,14 @@ IMPL_LINK_NOARG_INLINE_START(SwLabFmtPage, PreviewHdl)
 
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwLabFmtPage, PreviewHdl)
 
 // LoseFocus-Handler: Update on change
-IMPL_LINK_INLINE_START( SwLabFmtPage, LoseFocusHdl, Control *, pControl )
+IMPL_LINK( SwLabFmtPage, LoseFocusHdl, Control *, pControl )
 {
     if (static_cast<Edit*>( pControl)->IsModified())
         PreviewHdl(0);
     return 0;
 }
-IMPL_LINK_INLINE_END( SwLabFmtPage, LoseFocusHdl, Control *, pControl )
 
 void SwLabFmtPage::ChangeMinMax()
 {
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 7df369a9526c..ac5e749bf732 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -110,7 +110,7 @@ void SwJavaEditDialog::dispose()
     SvxStandardDialog::dispose();
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, PrevHdl)
+IMPL_LINK_NOARG(SwJavaEditDialog, PrevHdl)
 {
     pSh->EnterStdMode();
 
@@ -122,9 +122,8 @@ IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, PrevHdl)
 
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwJavaEditDialog, PrevHdl)
 
-IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, NextHdl)
+IMPL_LINK_NOARG(SwJavaEditDialog, NextHdl)
 {
     pSh->EnterStdMode();
 
@@ -136,7 +135,6 @@ IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, NextHdl)
 
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwJavaEditDialog, NextHdl)
 
 IMPL_LINK_NOARG(SwJavaEditDialog, OKHdl)
 {
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 719af75fdca5..b43f86fa9a07 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -280,7 +280,7 @@ void SwCaptionDialog::Apply()
     our_aSepTextSave = m_pSepEdit->GetText();
 }
 
-IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton )
+IMPL_LINK( SwCaptionDialog, OptionHdl, Button*, pButton )
 {
     OUString sFldTypeName = m_pCategoryBox->GetText();
     if(sFldTypeName == m_sNone)
@@ -302,14 +302,12 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton )
     DrawSample();
     return 0;
 }
-IMPL_LINK_INLINE_END( SwCaptionDialog, OptionHdl, Button*, pButton )
 
-IMPL_LINK_NOARG_INLINE_START(SwCaptionDialog, SelectHdl)
+IMPL_LINK_NOARG(SwCaptionDialog, SelectHdl)
 {
     DrawSample();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwCaptionDialog, SelectHdl)
 
 IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl)
 {
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 1f357799563a..5fa3585fad84 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2081,7 +2081,7 @@ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
     return 0;
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwFrmPage, RealSizeHdl)
+IMPL_LINK_NOARG(SwFrmPage, RealSizeHdl)
 {
     m_aWidthED.SetUserValue( m_aWidthED. NormalizePercent(aGrfSize.Width() ), FUNIT_TWIP);
     m_aHeightED.SetUserValue(m_aHeightED.NormalizePercent(aGrfSize.Height()), FUNIT_TWIP);
@@ -2089,7 +2089,6 @@ IMPL_LINK_NOARG_INLINE_START(SwFrmPage, RealSizeHdl)
     UpdateExample();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwFrmPage, RealSizeHdl)
 
 IMPL_LINK_NOARG(SwFrmPage, AutoWidthClickHdl)
 {
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index fe0d48b26fad..8e8f90cc24ee 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3812,7 +3812,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwTOXStylesTabPage, DoubleClickHdl)
+IMPL_LINK_NOARG(SwTOXStylesTabPage, DoubleClickHdl)
 {
     const OUString aTmpName( m_pParaLayLB->GetSelectEntry() );
     SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell();
@@ -3822,7 +3822,6 @@ IMPL_LINK_NOARG_INLINE_START(SwTOXStylesTabPage, DoubleClickHdl)
         AssignHdl(m_pAssignBT);
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwTOXStylesTabPage, DoubleClickHdl)
 
 // enable only when selected
 IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl)
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx
index 51cffaccac1b..17a7983f2480 100644
--- a/sw/source/ui/index/multmrk.cxx
+++ b/sw/source/ui/index/multmrk.cxx
@@ -45,7 +45,7 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr)
     m_pTextFT->SetText(rMgr.GetTOXMark(0)->GetTOXType()->GetTypeName());
 }
 
-IMPL_LINK_INLINE_START( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox )
+IMPL_LINK( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox )
 {
     if(pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
     {   SwTOXMark* pMark = rMgr.GetTOXMark(pBox->GetSelectEntryPos());
@@ -54,7 +54,6 @@ IMPL_LINK_INLINE_START( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox )
     }
     return 0;
 }
-IMPL_LINK_INLINE_END( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox )
 
 void SwMultiTOXMarkDlg::Apply()
 {
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index cb68df271d9b..5d31733e90ca 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -702,34 +702,31 @@ IMPL_LINK( SwIndexMarkPane, ModifyHdl, ListBox *, pBox )
     return 0;
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, NextHdl)
+IMPL_LINK_NOARG(SwIndexMarkPane, NextHdl)
 {
     InsertUpdate();
     pTOXMgr->NextTOXMark();
     UpdateDialog();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwIndexMarkPane, NextHdl)
 
-IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, NextSameHdl)
+IMPL_LINK_NOARG(SwIndexMarkPane, NextSameHdl)
 {
     InsertUpdate();
     pTOXMgr->NextTOXMark(true);
     UpdateDialog();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwIndexMarkPane, NextSameHdl)
 
-IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, PrevHdl)
+IMPL_LINK_NOARG(SwIndexMarkPane, PrevHdl)
 {
     InsertUpdate();
     pTOXMgr->PrevTOXMark();
     UpdateDialog();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwIndexMarkPane, PrevHdl)
 
-IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, PrevSameHdl)
+IMPL_LINK_NOARG(SwIndexMarkPane, PrevSameHdl)
 {
     InsertUpdate();
     pTOXMgr->PrevTOXMark(true);
@@ -737,7 +734,6 @@ IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, PrevSameHdl)
 
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwIndexMarkPane, PrevSameHdl)
 
 IMPL_LINK_NOARG(SwIndexMarkPane, DelHdl)
 {
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 04467a339ca4..81cf7bd44d6b 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -328,7 +328,7 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl)
 
 // Handler behind the button to collect the footnote at the chapter or end of
 // the document. In this case no pagewise numbering can be used.
-IMPL_LINK_NOARG_INLINE_START(SwEndNoteOptionPage, PosChapterHdl)
+IMPL_LINK_NOARG(SwEndNoteOptionPage, PosChapterHdl)
 {
     if ( !bPosDoc )
         SelectNumbering(FTNNUM_DOC);
@@ -340,7 +340,6 @@ IMPL_LINK_NOARG_INLINE_START(SwEndNoteOptionPage, PosChapterHdl)
     m_pPageTemplBox->Enable();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwEndNoteOptionPage, PosChapterHdl)
 
 static SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFmtName )
 {
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 3664343de66a..b1413b3d60e1 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -410,14 +410,13 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit )
     return 0;
 }
 
-IMPL_LINK_INLINE_START( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox )
+IMPL_LINK( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox )
 {
     SvTreeListEntry* pEntry = pBox->FirstSelected();
     if(pBox->GetParent(pEntry) && !bIsDocReadOnly)
         EndDialog( RET_OK );
     return 0;
 }
-IMPL_LINK_INLINE_END( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox )
 
 IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn )
 {
@@ -784,7 +783,7 @@ void SwGlossaryDlg::Init()
     m_pInsertTipCB->SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl));
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwGlossaryDlg, EditHdl)
+IMPL_LINK_NOARG(SwGlossaryDlg, EditHdl)
 {
 // EndDialog must not be called in MenuHdl
     if (m_pEditBtn->GetCurItemIdent() == "edit")
@@ -795,7 +794,6 @@ IMPL_LINK_NOARG_INLINE_START(SwGlossaryDlg, EditHdl)
     }
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwGlossaryDlg, EditHdl)
 
 // KeyInput for ShortName - Edits without Spaces
 IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox )
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 0824f3de8fd3..d3f3c086fddb 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -82,29 +82,26 @@ void SwInsFootNoteDlg::Apply()
     bFootnote = m_pFtnBtn->IsChecked();
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberCharHdl)
+IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberCharHdl)
 {
     m_pNumberCharEdit->GrabFocus();
     m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() || bExtCharAvailable );
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberCharHdl)
 
-IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberEditHdl)
+IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberEditHdl)
 {
     m_pNumberCharBtn->Check( true );
     m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() );
 
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberEditHdl)
 
-IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberAutoBtnHdl)
+IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberAutoBtnHdl)
 {
     m_pOkBtn->Enable( true );
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberAutoBtnHdl)
 
 IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl)
 {
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index f2a15a30cad9..679cdcbeedc6 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -92,13 +92,12 @@ void SwNumNamesDlg::dispose()
 
 
 // remember selected entry
-IMPL_LINK_INLINE_START( SwNumNamesDlg, SelectHdl, ListBox *, pBox )
+IMPL_LINK( SwNumNamesDlg, SelectHdl, ListBox *, pBox )
 {
     m_pFormEdit->SetText(pBox->GetSelectEntry());
     m_pFormEdit->SetSelection(Selection(0, SELECTION_MAX));
     return 0;
 }
-IMPL_LINK_INLINE_END( SwNumNamesDlg, SelectHdl, ListBox *, pBox )
 
 /** set user defined names
  *
@@ -122,20 +121,18 @@ void SwNumNamesDlg::SetUserNames(const OUString *pList[])
 }
 
 // unlock OK-Button when text is in Edit
-IMPL_LINK_INLINE_START( SwNumNamesDlg, ModifyHdl, Edit *, pBox )
+IMPL_LINK( SwNumNamesDlg, ModifyHdl, Edit *, pBox )
 {
     m_pOKBtn->Enable(!pBox->GetText().isEmpty());
     return 0;
 }
-IMPL_LINK_INLINE_END( SwNumNamesDlg, ModifyHdl, Edit *, pBox )
 
 // DoubleClickHdl
-IMPL_LINK_NOARG_INLINE_START(SwNumNamesDlg, DoubleClickHdl)
+IMPL_LINK_NOARG(SwNumNamesDlg, DoubleClickHdl)
 {
     EndDialog(RET_OK);
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwNumNamesDlg, DoubleClickHdl)
 
 SwNumNamesDlg::SwNumNamesDlg(vcl::Window *pParent)
     : ModalDialog(pParent, "NumberingNameDialog",
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index bd8b00829e65..43a013598177 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -52,20 +52,18 @@ const sal_uInt16 SwFootNotePage::aPageRg[] = {
 
 // handler to switch between the different possibilities how the footnote
 // region's height can be set.
-IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightPage)
+IMPL_LINK_NOARG(SwFootNotePage, HeightPage)
 {
     m_pMaxHeightEdit->Enable(false);
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwFootNotePage, HeightPage)
 
-IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightMetric)
+IMPL_LINK_NOARG(SwFootNotePage, HeightMetric)
 {
     m_pMaxHeightEdit->Enable();
     m_pMaxHeightEdit->GrabFocus();
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwFootNotePage, HeightMetric)
 
 // handler limit values
 IMPL_LINK_NOARG(SwFootNotePage, HeightModify)
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index 50ffa471b6f3..1ab303f1d9fd 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -31,7 +31,7 @@
 #include <cmdid.h>
 #include <table.hrc>
 
-IMPL_LINK_NOARG_INLINE_START(SwTableWidthDlg, LoseFocusHdl)
+IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl)
 {
     sal_uInt16 nId = (sal_uInt16)m_pColNF->GetValue()-1;
     const SwTwips lWidth = rFnc.GetColWidth(nId);
@@ -39,7 +39,6 @@ IMPL_LINK_NOARG_INLINE_START(SwTableWidthDlg, LoseFocusHdl)
     m_pWidthMF->SetValue(m_pWidthMF->Normalize(lWidth), FUNIT_TWIP);
     return 0;
 }
-IMPL_LINK_NOARG_INLINE_END(SwTableWidthDlg, LoseFocusHdl)
 
 SwTableWidthDlg::SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rTableFnc )
     : SvxStandardDialog( pParent, "ColumnWidthDialog", "modules/swriter/ui/columnwidth.ui" )
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index e67319432c11..0a24fe53619f 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -157,7 +157,7 @@ void SwInsTableDlg::dispose()
     SfxModalDialog::dispose();
 }
 
-IMPL_LINK_INLINE_START( SwInsTableDlg, ModifyName, Edit *, pEdit )
+IMPL_LINK( SwInsTableDlg, ModifyName, Edit *, pEdit )
 {
     OUString sTblName = pEdit->GetText();
     if (sTblName.indexOf(' ') != -1)
@@ -169,7 +169,6 @@ IMPL_LINK_INLINE_START( SwInsTableDlg, ModifyName, Edit *, pEdit )
     m_pInsertBtn->Enable(pShell->GetTblStyle( sTblName ) == 0);
     return 0;
 }
-IMPL_LINK_INLINE_END( SwInsTableDlg, ModifyName, Edit *, pEdit )
 
 IMPL_LINK( SwInsTableDlg, ModifyRowCol, NumericField *, pField )
 {
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index a90e84ce9eb7..00ee90230378 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -285,14 +285,13 @@ void SwFormatTablePage::RightModify()
     }
 }
 
-IMPL_LINK_INLINE_START( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
+IMPL_LINK( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
 {
     if( m_aRightMF.get() == pEdit)
         RightModify();
     ModifyHdl( pEdit );
     return 0;
 }
-IMPL_LINK_INLINE_END( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
 
 void  SwFormatTablePage::ModifyHdl(const Edit * pEdit)
 {
@@ -906,23 +905,21 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, void *, pControl )
     return 0;
 }
 
-IMPL_LINK_INLINE_START( SwTableColumnPage, UpHdl, MetricField*, pEdit )
+IMPL_LINK( SwTableColumnPage, UpHdl, MetricField*, pEdit )
 {
     bModified = true;
     ModifyHdl( pEdit );
     return 0;
 }
-IMPL_LINK_INLINE_END( SwTableColumnPage, UpHdl, MetricField*, pEdit )
 
-IMPL_LINK_INLINE_START( SwTableColumnPage, DownHdl, MetricField*, pEdit )
+IMPL_LINK( SwTableColumnPage, DownHdl, MetricField*, pEdit )
 {
     bModified = true;
     ModifyHdl( pEdit );
     return 0;
 }
-IMPL_LINK_INLINE_END( SwTableColumnPage, DownHdl, MetricField*, pEdit )
 
-IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
+IMPL_LINK( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
 {
     if (pEdit->IsModified())
     {
@@ -931,7 +928,6 @@ IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
     }
     return 0;
 }
-IMPL_LINK_INLINE_END( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
 
 IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox )
 {
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index a60439cd3ec0..5ff495ddafe8 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -502,14 +502,13 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG_INLINE_START(SwAutoFormatDlg, OkHdl)
+IMPL_LINK_NOARG(SwAutoFormatDlg, OkHdl)
 {
     if( bSetAutoFmt )
         pShell->SetTableAutoFmt( (*pTableTbl)[ nIndex ] );
     EndDialog( RET_OK );
     return sal_True;
 }
-IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl)
 
 AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent, WinBits nStyle) :
         Window          ( pParent, nStyle ),
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index e2e4bfe7bbb5..a9b95cf16957 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1528,13 +1528,12 @@ void SwDBManager::MergeCancel()
     bCancel = true;
 }
 
-IMPL_LINK_INLINE_START( SwDBManager, PrtCancelHdl, Button *, pButton )
+IMPL_LINK( SwDBManager, PrtCancelHdl, Button *, pButton )
 {
     pButton->GetParent()->Hide();
     MergeCancel();
     return 0;
 }
-IMPL_LINK_INLINE_END( SwDBManager, PrtCancelHdl, Button *, pButton )
 
 // determine the column's Numberformat and transfer to the forwarded Formatter,
 // if applicable.