diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-01-23 19:37:51 +0100 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-01-23 20:49:05 +0100 |
commit | bf110d40efcc79efb9247fdce5d2f54bafa6550b (patch) | |
tree | 4e9fad96d91adfd5159b009b430a64d4a6863bd6 /include/sfx2 | |
parent | 75d8b305bbc1c2377f23361ecd64816a350baa4c (diff) |
Change all Idle* LINKs to be Timer*
Seem UBSAN doesn't like my forced reinterpret_cast to set the Idles
Link in the Timer class. Now there are two possible solution:
1. convert all (DECL|IMPL).*_LINK call sites to use a Timer* or
2. split the inheritance of Idle from Timer again to maintain
different Link<>s and move all common code into a TimerBase.
While the 1st is more correct, the 2nd has a better indicator for
Idles. This implements the first solution.
And while at it, this also converts all call sites of SetTimeoutHdl
and SetIdleHdl to SetInvokeHandler and gets rid of some local Link
objects, which are just passed to the SetInvokeHandler call.
It also introduces ClearInvokeHandler() and replaces the respective
call sites of SetInvokeHandler( Link<Timer *, void>() ).
Change-Id: I40c4167b1493997b7f136add4dad2f4ff5504b69
Diffstat (limited to 'include/sfx2')
-rw-r--r-- | include/sfx2/basedlgs.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/dinfdlg.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/dispatch.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/dockwin.hxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 1ed1eb4166ac..b5c06c515e16 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -105,7 +105,7 @@ public: SfxBindings& GetBindings() { return *pBindings; } - DECL_LINK(TimerHdl, Idle *, void); + DECL_LINK(TimerHdl, Timer *, void); }; @@ -145,7 +145,7 @@ public: virtual void FillInfo(SfxChildWinInfo&) const; void Initialize (SfxChildWinInfo* pInfo); - DECL_LINK(TimerHdl, Idle *, void); + DECL_LINK(TimerHdl, Timer *, void); }; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 9ffbb3370e94..bea1e06311d8 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -420,8 +420,8 @@ private: DECL_LINK( BoxLoseFocusHdl, Control&, void ); //add lose focus handlers of Date/TimeField? - DECL_LINK(EditTimeoutHdl, Idle *, void); - DECL_LINK(BoxTimeoutHdl, Idle *, void); + DECL_LINK(EditTimeoutHdl, Timer *, void); + DECL_LINK(BoxTimeoutHdl, Timer *, void); bool IsLineValid( CustomPropertyLine* pLine ) const; void ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox ); diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index a172ced137de..441254a5490f 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -91,7 +91,7 @@ friend class SfxStateCache; friend class SfxPopupMenuManager; friend class SfxHelp; - DECL_DLLPRIVATE_LINK( EventHdl_Impl, Idle *, void ); + DECL_DLLPRIVATE_LINK( EventHdl_Impl, Timer *, void ); DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest *, void ); SAL_DLLPRIVATE void Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord ); diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index cadc84000ab1..d9b3109e4466 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -99,7 +99,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); const Size& GetMinOutputSizePixel() const; virtual bool EventNotify( NotifyEvent& rNEvt ) override; - DECL_LINK(TimerHdl, Idle *, void); + DECL_LINK(TimerHdl, Timer *, void); SAL_DLLPRIVATE void Initialize_Impl(); SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize ); |