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 /sw/source/ui/envelp | |
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 'sw/source/ui/envelp')
-rw-r--r-- | sw/source/ui/envelp/envfmt.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/envelp/label1.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/envelp/labfmt.cxx | 9 |
3 files changed, 6 insertions, 12 deletions
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() { |