summaryrefslogtreecommitdiff
path: root/extensions
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 /extensions
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 'extensions')
-rw-r--r--extensions/source/bibliography/bibcont.cxx4
-rw-r--r--extensions/source/bibliography/bibcont.hxx2
-rw-r--r--extensions/source/bibliography/toolbar.cxx4
-rw-r--r--extensions/source/bibliography/toolbar.hxx2
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx8
5 files changed, 10 insertions, 10 deletions
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 34292481a8b4..cf0c2625c7c2 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -120,7 +120,7 @@ BibBookContainer::BibBookContainer(vcl::Window* pParent):
aIdle("extensions BibBookContainer Split Idle")
{
pBibMod = OpenBibModul();
- aIdle.SetIdleHdl(LINK( this, BibBookContainer, SplitHdl));
+ aIdle.SetInvokeHandler(LINK( this, BibBookContainer, SplitHdl));
aIdle.SetPriority(TaskPriority::LOWEST);
}
@@ -160,7 +160,7 @@ void BibBookContainer::Split()
{
aIdle.Start();
}
-IMPL_LINK_NOARG( BibBookContainer, SplitHdl, Idle*, void)
+IMPL_LINK_NOARG( BibBookContainer, SplitHdl, Timer*, void)
{
long nSize= GetItemSize( TOP_WINDOW);
BibConfig* pConfig = BibModul::GetConfig();
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 028cfff8fc11..996c408340ef 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -72,7 +72,7 @@ class BibBookContainer: public BibSplitWindow
HdlBibModul pBibMod;
Idle aIdle;
- DECL_LINK( SplitHdl, Idle*, void );
+ DECL_LINK( SplitHdl, Timer*, void );
protected:
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index b62a03c0e1a9..7afd21011ed4 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -201,7 +201,7 @@ BibToolBar::BibToolBar(vcl::Window* pParent, Link<void*,void> aLink)
SvtMiscOptions().AddListenerLink( LINK( this, BibToolBar, OptionsChanged_Impl ) );
Application::AddEventListener( LINK( this, BibToolBar, SettingsChanged_Impl ) );
- aIdle.SetIdleHdl(LINK( this, BibToolBar, SendSelHdl));
+ aIdle.SetInvokeHandler(LINK( this, BibToolBar, SendSelHdl));
aIdle.SetPriority(TaskPriority::LOWEST);
SetDropdownClickHdl( LINK( this, BibToolBar, MenuHdl));
@@ -471,7 +471,7 @@ IMPL_LINK_NOARG( BibToolBar, SelHdl, ListBox&, void )
aIdle.Start();
}
-IMPL_LINK_NOARG( BibToolBar, SendSelHdl, Idle*, void )
+IMPL_LINK_NOARG( BibToolBar, SendSelHdl, Timer*, void )
{
Sequence<PropertyValue> aPropVal(1);
PropertyValue* pPropertyVal = const_cast<PropertyValue*>(aPropVal.getConstArray());
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index c1dbe7bd0abc..117de636d5f3 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -134,7 +134,7 @@ class BibToolBar: public ToolBox
BibDataManager* pDatMan;
DECL_LINK( SelHdl, ListBox&, void );
- DECL_LINK( SendSelHdl, Idle*, void );
+ DECL_LINK( SendSelHdl, Timer*, void );
DECL_LINK( MenuHdl, ToolBox*, void );
DECL_LINK( OptionsChanged_Impl, LinkParamNone*, void );
DECL_LINK( SettingsChanged_Impl, VclSimpleEvent&, void );
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index d8f3a036a8e6..16bba2d55dbb 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -140,7 +140,7 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper
private:
DECL_LINK(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool);
DECL_LINK(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool);
- DECL_LINK(WaitTimeOutHdl, Idle *, void);
+ DECL_LINK(WaitTimeOutHdl, Timer *, void);
DECL_LINK(TimeOutHdl, Timer *, void);
DECL_LINK(UserEventHdl, void *, void);
DECL_LINK(WindowEventHdl, VclWindowEvent&, void);
@@ -207,10 +207,10 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont
maBubbleImage = GetBubbleImage( maBubbleImageURL );
maWaitIdle.SetPriority( TaskPriority::LOWEST );
- maWaitIdle.SetIdleHdl( LINK( this, UpdateCheckUI, WaitTimeOutHdl ) );
+ maWaitIdle.SetInvokeHandler( LINK( this, UpdateCheckUI, WaitTimeOutHdl ) );
maTimeoutTimer.SetTimeout( 10000 );
- maTimeoutTimer.SetTimeoutHdl( LINK( this, UpdateCheckUI, TimeOutHdl ) );
+ maTimeoutTimer.SetInvokeHandler( LINK( this, UpdateCheckUI, TimeOutHdl ) );
uno::Reference< document::XDocumentEventBroadcaster > xBroadcaster( frame::theGlobalEventBroadcaster::get(m_xContext) );
xBroadcaster->addDocumentEventListener( this );
@@ -601,7 +601,7 @@ IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, rDat
}
-IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl, Idle *, void)
+IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl, Timer *, void)
{
SolarMutexGuard aGuard;