From 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 5 Oct 2016 07:56:12 +0200 Subject: Remove _TYPED suffix from tools/link.hxx macros ...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually typed Link" to distinguish the new, typed versions from the old, untyped ones, but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173 "remove untyped Link<>" removed the old versions. Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c --- cui/source/inc/numpages.hxx | 76 ++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'cui/source/inc/numpages.hxx') diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 6b7e70b771c3..101f62f28c0d 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -95,8 +95,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage sal_uInt16 nNumItemId; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxSingleNumPickTabPage(vcl::Window* pParent, @@ -129,8 +129,8 @@ class SvxBulletPickTabPage : public SfxTabPage OUString sBulletCharFormatName; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -172,8 +172,8 @@ class SvxNumPickTabPage : public SfxTabPage protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxNumPickTabPage(vcl::Window* pParent, @@ -217,9 +217,9 @@ class SvxBitmapPickTabPage : public SfxTabPage bool bPreset : 1; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(ClickAddBrowseHdl_Impl, Button*, void ); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(ClickAddBrowseHdl_Impl, Button*, void ); public: @@ -315,22 +315,22 @@ class SvxNumOptionsTabPage : public SfxTabPage void SwitchNumberType( sal_uInt8 nType, bool bBmp = false ); void CheckForStartValue_Impl(sal_uInt16 nNumberingType); - DECL_LINK_TYPED( NumberTypeSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( PopupActivateHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( BulletHdl_Impl, Button*, void); - DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); - DECL_LINK_TYPED( CharFmtHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( EditListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( AllLevelHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( OrientHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SameLevelHdl_Impl, Button*, void ); - DECL_LINK_TYPED( BulColorHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( BulRelSizeHdl_Impl, Edit&, void); - DECL_LINK_TYPED( PreviewInvalidateHdl_Impl, Timer *, void); + DECL_LINK( NumberTypeSelectHdl_Impl, ListBox&, void ); + DECL_LINK( LevelHdl_Impl, ListBox&, void ); + DECL_LINK( PopupActivateHdl_Impl, MenuButton *, void ); + DECL_LINK( GraphicHdl_Impl, MenuButton *, void ); + DECL_LINK( BulletHdl_Impl, Button*, void); + DECL_LINK( SizeHdl_Impl, Edit&, void ); + DECL_LINK( RatioHdl_Impl, Button*, void ); + DECL_LINK( CharFmtHdl_Impl, ListBox&, void ); + DECL_LINK( EditModifyHdl_Impl, Edit&, void ); + DECL_LINK( EditListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( AllLevelHdl_Impl, Edit&, void ); + DECL_LINK( OrientHdl_Impl, ListBox&, void ); + DECL_LINK( SameLevelHdl_Impl, Button*, void ); + DECL_LINK( BulColorHdl_Impl, ListBox&, void ); + DECL_LINK( BulRelSizeHdl_Impl, Edit&, void); + DECL_LINK( PreviewInvalidateHdl_Impl, Timer *, void); void EditModifyHdl_Impl(Edit*); public: @@ -410,23 +410,23 @@ class SvxNumPositionTabPage : public SfxTabPage void InitControls(); - DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditModifyHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( DistanceHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( DistanceFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( RelativeHdl_Impl, Button*, void ); - DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); + DECL_LINK( LevelHdl_Impl, ListBox&, void ); + DECL_LINK( EditModifyHdl_Impl, ListBox&, void); + DECL_LINK( DistanceHdl_Impl, SpinField&, void ); + DECL_LINK( DistanceFocusHdl_Impl, Control&, void ); + DECL_LINK( RelativeHdl_Impl, Button*, void ); + DECL_LINK( StandardHdl_Impl, Button*, void); void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); - DECL_LINK_TYPED(LabelFollowedByHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ListtabPosHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( ListtabPosFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( AlignAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( AlignAtFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( IndentAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( IndentAtFocusHdl_Impl, Control&, void ); + DECL_LINK(LabelFollowedByHdl_Impl, ListBox&, void); + DECL_LINK( ListtabPosHdl_Impl, SpinField&, void ); + DECL_LINK( ListtabPosFocusHdl_Impl, Control&, void ); + DECL_LINK( AlignAtHdl_Impl, SpinField&, void ); + DECL_LINK( AlignAtFocusHdl_Impl, Control&, void ); + DECL_LINK( IndentAtHdl_Impl, SpinField&, void ); + DECL_LINK( IndentAtFocusHdl_Impl, Control&, void ); public: SvxNumPositionTabPage(vcl::Window* pParent, -- cgit