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 /sfx2 | |
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 'sfx2')
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 9 | ||||
-rw-r--r-- | sfx2/source/dialog/newstyle.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/dialog/passwd.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/doc/new.cxx | 13 | ||||
-rw-r--r-- | sfx2/source/notify/hintpost.cxx | 5 |
7 files changed, 10 insertions, 31 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index a7a4f22bd839..51644e7d80ad 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -495,7 +495,7 @@ void SfxDispatcher::Pop(SfxShell& rShell, SfxDispatcherPopFlags nMode) It flushes the Stack, if it is dirty, thus it actually executes the pending Push and Pop commands. */ -IMPL_LINK_INLINE_START( SfxDispatcher, EventHdl_Impl, void *, pvoid ) +IMPL_LINK( SfxDispatcher, EventHdl_Impl, void *, pvoid ) { (void)pvoid; // unused @@ -506,7 +506,6 @@ IMPL_LINK_INLINE_START( SfxDispatcher, EventHdl_Impl, void *, pvoid ) pBindings->StartUpdate_Impl(false); return 0; } -IMPL_LINK_INLINE_END( SfxDispatcher, EventHdl_Impl, void *, pvoid ) /** With this method it can be tested whether the <SfxShell> rShell is on the stack, when it was flushed. This way the SfxDispatcher is not actually diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 47c59880a8b3..5bc78c42855b 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -419,7 +419,7 @@ bool SfxManageStyleSheetPage::Execute_Impl( } -IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit ) +IMPL_LINK( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit ) /* [Description] @@ -430,10 +430,8 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit ) aBuf = comphelper::string::stripStart(pEdit->GetText(), ' '); return 0; } -IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit ) - -IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit ) +IMPL_LINK( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit ) /* [Description] @@ -450,9 +448,6 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit ) UpdateName_Impl(m_pFollowLb, aStr); return 0; } -IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit ) - - bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet* rSet ) diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index d3f26dc748cb..0824e3d3c09d 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -50,12 +50,11 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl ) return 0; } -IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) +IMPL_LINK( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) { m_pOKBtn->Enable( !comphelper::string::remove(pBox->GetText(), ' ').isEmpty() ); return 0; } -IMPL_LINK_INLINE_END( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) SfxNewStyleDlg::SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& rInPool ) : ModalDialog(pParent, "CreateStyleDialog", "sfx/ui/newstyle.ui") diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 0b6a20278a13..e120179324ae 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -29,7 +29,7 @@ -IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit ) +IMPL_LINK( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit ) { if (mbAsciiOnly && (pEdit == mpPassword1ED || pEdit == mpPassword2ED)) { @@ -59,9 +59,6 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit ) mpOKBtn->Enable( bEnable ); return 0; } -IMPL_LINK_INLINE_END(SfxPasswordDialog, EditModifyHdl, Edit *, pEdit) - - IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl) { diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 1a922bba75b8..53dca486fe3a 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2430,13 +2430,12 @@ bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId) } } -IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox ) +IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox ) { const sal_uInt16 nEntry = pBox->GetCurItemId(); FamilySelect(nEntry); return 0; } -IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox ) static OUString lcl_GetLabel(uno::Any& rAny) { diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 7a854971df6d..78884e561804 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -268,13 +268,11 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox ) return 0; } -IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, Expand) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Expand) { TemplateSelect(m_pTemplateLb); return 0; } -IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, Expand) - IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect) { @@ -290,7 +288,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect) return 0; } -IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox ) +IMPL_LINK( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox ) { (void)pListBox; // Still loadning @@ -298,17 +296,12 @@ IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox pAntiImpl->EndDialog(RET_OK); return 0; } -IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox ) - - -IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, LoadFile) +IMPL_LINK_NOARG(SfxNewFileDialog_Impl, LoadFile) { pAntiImpl->EndDialog(RET_TEMPLATE_LOAD); return 0; } -IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, LoadFile) - sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const { diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx index f0b127a9c337..2e868834e0d1 100644 --- a/sfx2/source/notify/hintpost.cxx +++ b/sfx2/source/notify/hintpost.cxx @@ -47,15 +47,12 @@ void SfxHintPoster::Post( SfxHint* pHintToPost ) -IMPL_LINK_INLINE_START( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint ) +IMPL_LINK( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint ) { Event( pPostedHint ); ReleaseRef(); return 0; } -IMPL_LINK_INLINE_END( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint ) - - void SfxHintPoster::Event( SfxHint* pPostedHint ) { |