summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-05 09:59:27 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-05 12:05:38 +0200
commitc9b4c5681194a1cd3297a36d4a1f4e4cc3aac55a (patch)
tree2cb864a67b556f807ba175507296f7dfc5254944 /extensions
parent8c4a1663f5d93380268365d35a5581d8065df897 (diff)
Use typed Idle::SetIdleHdl Link
Change-Id: I189937950325dc4ef663f7f49cb45f38f8537de9
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/bibliography/bibcont.cxx3
-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.cxx6
5 files changed, 6 insertions, 11 deletions
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 5eba4bac1bbc..5c75e528b515 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -164,14 +164,13 @@ void BibBookContainer::Split()
{
aIdle.Start();
}
-IMPL_LINK( BibBookContainer, SplitHdl, Timer*,/*pT*/)
+IMPL_LINK_NOARG_TYPED( BibBookContainer, SplitHdl, Idle*, void)
{
long nSize= GetItemSize( TOP_WINDOW);
BibConfig* pConfig = BibModul::GetConfig();
pConfig->setBeamerSize(nSize);
nSize = GetItemSize( BOTTOM_WINDOW);
pConfig->setViewSize(nSize);
- return 0;
}
void BibBookContainer::createTopFrame( BibShortCutHandler* pWin )
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 3488c2ee27ee..cb1d07e6a1ed 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -75,7 +75,7 @@ class BibBookContainer: public BibSplitWindow
HdlBibModul pBibMod;
Idle aIdle;
- DECL_LINK( SplitHdl, Timer*);
+ DECL_LINK_TYPED( SplitHdl, Idle*, void );
protected:
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 717591d65f3f..08ddcced7d15 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -468,7 +468,7 @@ IMPL_LINK( BibToolBar, SelHdl, ListBox*, /*pLb*/ )
return 0;
}
-IMPL_LINK( BibToolBar, SendSelHdl, Timer*,/*pT*/)
+IMPL_LINK_NOARG_TYPED( BibToolBar, SendSelHdl, Idle*, void )
{
Sequence<PropertyValue> aPropVal(1);
PropertyValue* pPropertyVal = const_cast<PropertyValue*>(aPropVal.getConstArray());
@@ -477,8 +477,6 @@ IMPL_LINK( BibToolBar, SendSelHdl, Timer*,/*pT*/)
OUString aSelection = aEntry;
pPropertyVal[0].Value <<= aSelection;
SendDispatch(TBC_LB_SOURCE,aPropVal);
-
- return 0;
}
IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/)
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 8e36b56026b9..ddd9a0259323 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -129,7 +129,7 @@ class BibToolBar: public ToolBox
BibDataManager* pDatMan;
DECL_LINK( SelHdl, ListBox* );
- DECL_LINK( SendSelHdl, Timer* );
+ DECL_LINK_TYPED( SendSelHdl, Idle*, void );
DECL_LINK( MenuHdl, ToolBox* );
DECL_LINK( OptionsChanged_Impl, void* );
DECL_LINK( SettingsChanged_Impl, void* );
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 6c666f59a922..4a9fbe9bb640 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -145,7 +145,7 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper3
private:
DECL_LINK(ClickHdl, void *);
DECL_LINK( HighlightHdl, MenuBar::MenuBarButtonCallbackArg* );
- DECL_LINK(WaitTimeOutHdl, void *);
+ DECL_LINK_TYPED(WaitTimeOutHdl, Idle *, void);
DECL_LINK_TYPED(TimeOutHdl, Timer *, void);
DECL_LINK(UserEventHdl, void *);
DECL_LINK( WindowEventHdl, VclWindowEvent* );
@@ -612,7 +612,7 @@ IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg*, pDat
}
-IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl)
+IMPL_LINK_NOARG_TYPED(UpdateCheckUI, WaitTimeOutHdl, Idle *, void)
{
SolarMutexGuard aGuard;
@@ -622,8 +622,6 @@ IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl)
{
mpBubbleWin->Show();
}
-
- return 0;
}