diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-29 17:05:19 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-29 18:29:59 +0200 |
commit | 0acd47f68e3efb46dafd866ee95497da818fa34f (patch) | |
tree | e7bc16002983079713868dd91478d24aac6cfed3 /cui | |
parent | 17cb3391ece392497eeff4ed32cbf89b4bcb5825 (diff) |
Remove unnecessary IMPL_LINK[_NOARG]_INLINE_START/END
...just use IMPL_LINK[_NOARG] and let the compiler decide what to inline
Change-Id: I63ec5116df7e79093ebf31193f8c674f1351c0e6
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/dlgname.cxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/insdlg.cxx | 5 | ||||
-rw-r--r-- | cui/source/dialogs/linkdlg.cxx | 9 | ||||
-rw-r--r-- | cui/source/dialogs/pastedlg.cxx | 3 | ||||
-rw-r--r-- | cui/source/dialogs/postdlg.cxx | 10 | ||||
-rw-r--r-- | cui/source/options/optdict.cxx | 5 | ||||
-rw-r--r-- | cui/source/tabpages/labdlg.cxx | 15 | ||||
-rw-r--r-- | cui/source/tabpages/page.cxx | 10 | ||||
-rw-r--r-- | cui/source/tabpages/paragrph.cxx | 3 | ||||
-rw-r--r-- | cui/source/tabpages/tabarea.cxx | 5 | ||||
-rw-r--r-- | cui/source/tabpages/tabline.cxx | 5 | ||||
-rw-r--r-- | cui/source/tabpages/tplnedef.cxx | 5 |
12 files changed, 19 insertions, 62 deletions
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 7745404b4ae5..60849f150659 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -191,21 +191,19 @@ void SvxMessDialog::dispose() /*************************************************************************/ -IMPL_LINK_NOARG_INLINE_START(SvxMessDialog, Button1Hdl) +IMPL_LINK_NOARG(SvxMessDialog, Button1Hdl) { EndDialog( RET_BTN_1 ); return 0; } -IMPL_LINK_NOARG_INLINE_END(SvxMessDialog, Button1Hdl) /*************************************************************************/ -IMPL_LINK_NOARG_INLINE_START(SvxMessDialog, Button2Hdl) +IMPL_LINK_NOARG(SvxMessDialog, Button2Hdl) { EndDialog( RET_BTN_2 ); return 0; } -IMPL_LINK_NOARG_INLINE_END(SvxMessDialog, Button2Hdl) /*************************************************************************/ diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 22c3c277082a..b256fa40a468 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -102,14 +102,11 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OU -IMPL_LINK_NOARG_INLINE_START(SvInsertOleDlg, DoubleClickHdl) +IMPL_LINK_NOARG(SvInsertOleDlg, DoubleClickHdl) { EndDialog( RET_OK ); return 0; } -IMPL_LINK_INLINE_END( SvInsertOleDlg, DoubleClickHdl, ListBox *, pListBox ) - - IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl) { diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 0995ae4c6ad5..c947538640f1 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -250,16 +250,15 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) return 0; } -IMPL_LINK_INLINE_START( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox ) +IMPL_LINK( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox ) { (void)pSvTabListBox; ChangeSourceClickHdl( 0 ); return 0; } -IMPL_LINK_INLINE_END( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox ) -IMPL_LINK_INLINE_START( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadioButton ) +IMPL_LINK( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadioButton ) { (void)pRadioButton; @@ -270,9 +269,8 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadio SetType( *pLink, nPos, SfxLinkUpdateMode::ALWAYS ); return 0; } -IMPL_LINK_INLINE_END( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadioButton ) -IMPL_LINK_INLINE_START( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton ) +IMPL_LINK( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton ) { (void)pRadioButton; @@ -283,7 +281,6 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioBut SetType( *pLink, nPos, SfxLinkUpdateMode::ONCALL ); return 0; } -IMPL_LINK_INLINE_END( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton ) IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl) { diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index ff6263a2587e..4c1d5ab8db19 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -83,14 +83,13 @@ IMPL_LINK( SvPasteObjectDialog, SelectHdl, ListBox *, pListBox ) return 0; } -IMPL_LINK_INLINE_START( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox ) +IMPL_LINK( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox ) { (void)pListBox; EndDialog( RET_OK ); return 0; } -IMPL_LINK_INLINE_END( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox ) /************************************************************************* |* SvPasteObjectDialog::Insert() diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index c1e43e1939c4..0db4949f73c2 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -174,23 +174,17 @@ void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) -IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, PrevHdl) +IMPL_LINK_NOARG(SvxPostItDialog, PrevHdl) { aPrevHdlLink.Call( this ); return 0; } -IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, PrevHdl) - - -IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, NextHdl) +IMPL_LINK_NOARG(SvxPostItDialog, NextHdl) { aNextHdlLink.Call( this ); return 0; } -IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, NextHdl) - - IMPL_LINK_NOARG(SvxPostItDialog, Stamp) { diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index de08c8ba7adf..3b78f4c603cf 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -206,7 +206,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) -IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl) +IMPL_LINK_NOARG(SvxNewDictionaryDialog, ModifyHdl_Impl) { if ( !pNameEdit->GetText().isEmpty() ) pOKBtn->Enable(); @@ -214,9 +214,6 @@ IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl) pOKBtn->Disable(); return 0; } -IMPL_LINK_NOARG_INLINE_END(SvxNewDictionaryDialog, ModifyHdl_Impl) - - // class SvxEditDictionaryDialog ------------------------------------------- diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index d57e180245d1..1f053174161f 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -422,7 +422,7 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType ) -IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListBox ) +IMPL_LINK( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListBox ) { if (pListBox == m_pLB_ANSATZ) { @@ -430,11 +430,8 @@ IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pLis } return 0; } -IMPL_LINK_INLINE_END( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListBox ) - - -IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox ) +IMPL_LINK( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox ) { if (pListBox == m_pLB_ANSATZ_REL) { @@ -442,9 +439,6 @@ IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, p } return 0; } -IMPL_LINK_INLINE_END( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox ) - - IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton ) { @@ -466,14 +460,11 @@ IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton ) -IMPL_LINK_NOARG_INLINE_START(SvxCaptionTabPage, SelectCaptTypeHdl_Impl) +IMPL_LINK_NOARG(SvxCaptionTabPage, SelectCaptTypeHdl_Impl) { SetupType_Impl( m_pCT_CAPTTYPE->GetSelectItemId() ); return 0; } -IMPL_LINK_NOARG_INLINE_END(SvxCaptionTabPage, SelectCaptTypeHdl_Impl) - - void SvxCaptionTabPage::SetupType_Impl( sal_uInt16 nType ) { diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 6a37a3d1f1ed..df8eb1032ac2 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1184,16 +1184,13 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) -IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, BorderModify_Impl) +IMPL_LINK_NOARG(SvxPageDescPage, BorderModify_Impl) { if ( !bBorderModified ) bBorderModified = true; UpdateExample_Impl(); return 0; } -IMPL_LINK_NOARG_INLINE_END(SvxPageDescPage, BorderModify_Impl) - - void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground ) { @@ -1652,16 +1649,13 @@ void SvxPageDescPage::CalcMargin_Impl() -IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, CenterHdl_Impl) +IMPL_LINK_NOARG(SvxPageDescPage, CenterHdl_Impl) { m_pBspWin->SetHorz( m_pHorzBox->IsChecked() ); m_pBspWin->SetVert( m_pVertBox->IsChecked() ); UpdateExample_Impl(); return 0; } -IMPL_LINK_NOARG_INLINE_END(SvxPageDescPage, CenterHdl_Impl) - - void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) { diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 56b1345db3ad..0d2dc16b4992 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -823,12 +823,11 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox ) return 0; } -IMPL_LINK_NOARG_INLINE_START(SvxStdParagraphTabPage, ModifyHdl_Impl) +IMPL_LINK_NOARG(SvxStdParagraphTabPage, ModifyHdl_Impl) { UpdateExample_Impl(); return 0; } -IMPL_LINK_NOARG_INLINE_END(SvxStdParagraphTabPage, ModifyHdl_Impl) void SvxStdParagraphTabPage::Init_Impl() { diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 53835ac1b200..7ecc83618bbd 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -216,16 +216,13 @@ short SvxAreaTabDialog::Ok() -IMPL_LINK_NOARG_INLINE_START(SvxAreaTabDialog, CancelHdlImpl) +IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl) { SavePalettes(); EndDialog( RET_CANCEL ); return 0; } -IMPL_LINK_INLINE_END( SvxAreaTabDialog, CancelHdlImpl, void *, p ) - - void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 71a7a5617a1c..aa99b2cd447b 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -177,16 +177,13 @@ short SvxLineTabDialog::Ok() -IMPL_LINK_NOARG_INLINE_START(SvxLineTabDialog, CancelHdlImpl) +IMPL_LINK_NOARG(SvxLineTabDialog, CancelHdlImpl) { SavePalettes(); EndDialog( RET_CANCEL ); return 0; } -IMPL_LINK_NOARG_INLINE_END(SvxLineTabDialog, CancelHdlImpl) - - void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 32309ac1269e..c2448b280d57 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -391,16 +391,13 @@ IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p ) -IMPL_LINK_NOARG_INLINE_START(SvxLineDefTabPage, ChangePreviewHdl_Impl) +IMPL_LINK_NOARG(SvxLineDefTabPage, ChangePreviewHdl_Impl) { FillDash_Impl(); m_pCtlPreview->Invalidate(); return 0L; } -IMPL_LINK_NOARG_INLINE_END(SvxLineDefTabPage, ChangePreviewHdl_Impl) - - IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl) { |