summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-29 17:05:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-29 18:29:59 +0200
commit0acd47f68e3efb46dafd866ee95497da818fa34f (patch)
treee7bc16002983079713868dd91478d24aac6cfed3 /svx
parent17cb3391ece392497eeff4ed32cbf89b4bcb5825 (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 'svx')
-rw-r--r--svx/source/dialog/fontwork.cxx3
-rw-r--r--svx/source/dialog/hdft.cxx9
-rw-r--r--svx/source/dialog/svxruler.cxx3
-rw-r--r--svx/source/mnuctrls/SmartTagCtl.cxx5
-rw-r--r--svx/source/mnuctrls/fntctl.cxx5
-rw-r--r--svx/source/svdraw/svdpntv.cxx3
6 files changed, 8 insertions, 20 deletions
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 7e3f5d4bb831..713b9e9847e8 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -740,12 +740,11 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectShadowHdl_Impl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SvxFontWorkDialog, ModifyInputHdl_Impl)
+IMPL_LINK_NOARG(SvxFontWorkDialog, ModifyInputHdl_Impl)
{
aInputIdle.Start();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxFontWorkDialog, ModifyInputHdl_Impl)
IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
{
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 4e002a88f5a1..6f21f6c1a760 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -566,27 +566,24 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SvxHFPage, DistModify)
+IMPL_LINK_NOARG(SvxHFPage, DistModify)
{
UpdateExample();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxHFPage, DistModify)
-IMPL_LINK_NOARG_INLINE_START(SvxHFPage, HeightModify)
+IMPL_LINK_NOARG(SvxHFPage, HeightModify)
{
UpdateExample();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxHFPage, HeightModify)
-IMPL_LINK_NOARG_INLINE_START(SvxHFPage, BorderModify)
+IMPL_LINK_NOARG(SvxHFPage, BorderModify)
{
UpdateExample();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxHFPage, BorderModify)
IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl)
{
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 3c12829bff3e..1a8f6d95fd6c 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3426,13 +3426,12 @@ void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint)
}
-IMPL_LINK_INLINE_START( SvxRuler, MenuSelect, Menu *, pMenu )
+IMPL_LINK( SvxRuler, MenuSelect, Menu *, pMenu )
{
/* Handler of the context menus for switching the unit of measurement */
SetUnit(FieldUnit(pMenu->GetCurItemId()));
return 0;
}
-IMPL_LINK_INLINE_END( SvxRuler, MenuSelect, Menu *, pMenu )
IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
{
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index be1f7483726d..71e917c29993 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -154,7 +154,7 @@ void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const S
-IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
+IMPL_LINK( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
{
if ( !mpSmartTagItem )
return 0;
@@ -187,9 +187,6 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
return 0;
}
-IMPL_LINK_INLINE_END( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
-
-
SvxSmartTagsControl::~SvxSmartTagsControl()
{
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index d1f68db799ee..3dd099569bf8 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -134,16 +134,13 @@ void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint )
weiteren Fontinformationen mu\s durch die Applikation geschehen.
*/
-IMPL_LINK_INLINE_START( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen )
+IMPL_LINK( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen )
{
SvxFontItem aItem( GetId() );
aItem.SetFamilyName(pMen->GetCurName());
GetBindings().GetDispatcher()->Execute( GetId(), SfxCallMode::RECORD, &aItem, 0L );
return 0;
}
-IMPL_LINK_INLINE_END( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen )
-
-
/* [Beschreibung]
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 59c0fbb36d8a..dfc7d210e6a5 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -293,7 +293,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_
-IMPL_LINK_NOARG_INLINE_START(SdrPaintView, ImpComeBackHdl)
+IMPL_LINK_NOARG(SdrPaintView, ImpComeBackHdl)
{
if (bSomeObjChgdFlag) {
bSomeObjChgdFlag=false;
@@ -301,7 +301,6 @@ IMPL_LINK_NOARG_INLINE_START(SdrPaintView, ImpComeBackHdl)
}
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SdrPaintView,ImpComeBackHdl)
void SdrPaintView::FlushComeBackTimer() const
{