diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /svx/inc | |
parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) |
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
Diffstat (limited to 'svx/inc')
-rw-r--r-- | svx/inc/GalleryControl.hxx | 2 | ||||
-rw-r--r-- | svx/inc/galbrws2.hxx | 10 | ||||
-rw-r--r-- | svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 2 | ||||
-rw-r--r-- | svx/inc/svdibrow.hxx | 6 | ||||
-rw-r--r-- | svx/inc/tbunosearchcontrollers.hxx | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index 87d8c246b25f..ca6365d686e5 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -58,7 +58,7 @@ private: virtual void Resize() override; virtual void GetFocus() override; - DECL_LINK_TYPED(SplitHdl, Splitter*, void); + DECL_LINK(SplitHdl, Splitter*, void); protected: void ThemeSelectionHasChanged(); diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 13f6b068e66a..b753fd16aa3a 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -126,10 +126,10 @@ private: // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - DECL_LINK_TYPED( SelectObjectHdl, GalleryListView*, void ); - DECL_LINK_TYPED( SelectObjectValueSetHdl, ValueSet*, void ); - DECL_LINK_TYPED( SelectTbxHdl, ToolBox*, void ); - DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void ); + DECL_LINK( SelectObjectHdl, GalleryListView*, void ); + DECL_LINK( SelectObjectValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectTbxHdl, ToolBox*, void ); + DECL_LINK( MiscHdl, LinkParamNone*, void ); private: @@ -172,7 +172,7 @@ public: const css::uno::Reference< css::frame::XDispatch > &rxDispatch, const css::util::URL &rURL ); - DECL_STATIC_LINK_TYPED( GalleryBrowser2, AsyncDispatch_Impl, void*, void ); + DECL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, void*, void ); }; #endif diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index 5528315fe20f..42fcf21369c1 100644 --- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx @@ -52,7 +52,7 @@ namespace sdr bool mbRefreshWithPreRendering : 1; // link for timer - DECL_LINK_TYPED(ImpBufferTimerHandler, Idle*, void); + DECL_LINK(ImpBufferTimerHandler, Idle*, void); // Internal methods for buffering void ImpPrepareBufferDevice(); diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index fd1c675b3686..86db5f7d29ff 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -102,9 +102,9 @@ class SdrItemBrowser: public FloatingWindow { SdrView* pView; bool bDirty; static vcl::Window* ImpGetViewWin(SdrView& rView); - DECL_LINK_TYPED(IdleHdl, Idle *, void); - DECL_LINK_TYPED(ChangedHdl, SdrItemBrowserControl&, void); - DECL_LINK_TYPED(SetDirtyHdl, SdrItemBrowserControl&, void); + DECL_LINK(IdleHdl, Idle *, void); + DECL_LINK(ChangedHdl, SdrItemBrowserControl&, void); + DECL_LINK(SetDirtyHdl, SdrItemBrowserControl&, void); public: SdrItemBrowser(SdrView& rView); virtual ~SdrItemBrowser() override; diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 81233727bb9b..2b0de95c021d 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -113,7 +113,7 @@ public: // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); private: |