summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2017-01-23 19:37:51 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2017-01-23 20:49:05 +0100
commitbf110d40efcc79efb9247fdce5d2f54bafa6550b (patch)
tree4e9fad96d91adfd5159b009b430a64d4a6863bd6 /sc/source/ui/inc
parent75d8b305bbc1c2377f23361ecd64816a350baa4c (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 'sc/source/ui/inc')
-rw-r--r--sc/source/ui/inc/acredlin.hxx4
-rw-r--r--sc/source/ui/inc/anyrefdg.hxx2
-rw-r--r--sc/source/ui/inc/autostyl.hxx2
-rw-r--r--sc/source/ui/inc/conflictsdlg.hxx2
-rw-r--r--sc/source/ui/inc/filtdlg.hxx2
-rw-r--r--sc/source/ui/inc/navipi.hxx2
-rw-r--r--sc/source/ui/inc/tphfedit.hxx2
7 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index eff8461682fe..10f50fddccaf 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -104,10 +104,10 @@ private:
DECL_LINK( SelectHandle, SvTreeListBox*, void );
DECL_LINK( RefInfoHandle, const OUString*, void );
- DECL_LINK( UpdateSelectionHdl, Idle*, void );
+ DECL_LINK( UpdateSelectionHdl, Timer*, void );
DECL_LINK( ChgTrackModHdl, ScChangeTrack&, void );
DECL_LINK( CommandHdl, SvSimpleTable*, void );
- DECL_LINK( ReOpenTimerHdl, Idle*, void );
+ DECL_LINK( ReOpenTimerHdl, Timer*, void );
DECL_LINK( ColCompareHdl, const SvSortData*, sal_Int32 );
protected:
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 963036a1d7ef..03cbaeb182a8 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -120,7 +120,7 @@ private:
Idle aIdle;
OUString aDocName; // document on which the dialog was opened
- DECL_LINK( UpdateFocusHdl, Idle*, void );
+ DECL_LINK( UpdateFocusHdl, Timer*, void );
protected:
void disposeRefHandler();
diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx
index ff078209911b..d84f7a2a077e 100644
--- a/sc/source/ui/inc/autostyl.hxx
+++ b/sc/source/ui/inc/autostyl.hxx
@@ -64,7 +64,7 @@ private:
void AdjustEntries(sal_uLong nDiff);
void StartTimer(sal_uLong nNow);
DECL_LINK( TimerHdl, Timer*, void );
- DECL_LINK( InitHdl, Idle*, void );
+ DECL_LINK( InitHdl, Timer*, void );
public:
ScAutoStyleList(ScDocShell* pShell);
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index bed2f73a2707..81edfe2a1a71 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -151,7 +151,7 @@ private:
DECL_LINK( SelectHandle, SvTreeListBox*, void );
DECL_LINK( DeselectHandle, SvTreeListBox*, void );
- DECL_LINK( UpdateSelectionHdl, Idle*, void );
+ DECL_LINK( UpdateSelectionHdl, Timer*, void );
DECL_LINK( KeepMineHandle, Button*, void );
DECL_LINK( KeepOtherHandle, Button*, void );
DECL_LINK( KeepAllMineHandle, Button*, void );
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index f2e2dfa735c6..558f5eae00d0 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -220,7 +220,7 @@ private:
DECL_LINK( EndDlgHdl, Button*, void );
// Hack: RefInput control
- DECL_LINK( TimeOutHdl, Idle*, void );
+ DECL_LINK( TimeOutHdl, Timer*, void );
};
#endif // INCLUDED_SC_SOURCE_UI_INC_FILTDLG_HXX
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index a7991fa77358..68fdba9be8fb 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -214,7 +214,7 @@ private:
ScNavigatorControllerItem** ppBoundItems;
- DECL_LINK(TimeHdl, Idle*, void);
+ DECL_LINK(TimeHdl, Timer*, void);
DECL_LINK(DocumentSelectHdl, ListBox&, void);
DECL_LINK(ToolBoxSelectHdl, ToolBox*, void);
DECL_LINK(ToolBoxDropdownClickHdl, ToolBox*, void);
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index dba4b2e3071d..e63b00d8161c 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -108,7 +108,7 @@ private:
sal_uInt16 nSelected;
OString aSelectedIdent;
- DECL_DLLPRIVATE_LINK( TimerHdl, Idle*, void );
+ DECL_DLLPRIVATE_LINK( TimerHdl, Timer*, void );
protected: