summaryrefslogtreecommitdiff
path: root/sc
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 /sc
parent8c4a1663f5d93380268365d35a5581d8065df897 (diff)
Use typed Idle::SetIdleHdl Link
Change-Id: I189937950325dc4ef663f7f49cb45f38f8537de9
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/chartlis.hxx2
-rw-r--r--sc/inc/document.hxx2
-rw-r--r--sc/inc/scmod.hxx2
-rw-r--r--sc/source/core/data/documen2.cxx4
-rw-r--r--sc/source/core/tool/chartlis.cxx5
-rw-r--r--sc/source/ui/app/scmod.cxx5
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx4
-rw-r--r--sc/source/ui/docshell/autostyl.cxx4
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx3
-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/dwfunctr.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
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx8
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx3
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx6
-rw-r--r--sc/source/ui/navipi/navipi.cxx5
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx7
22 files changed, 30 insertions, 48 deletions
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index e8b5905e5e52..667e5ea978fd 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -152,7 +152,7 @@ private:
Idle aIdle;
ScDocument* pDoc;
- DECL_LINK(TimerHdl, void *);
+ DECL_LINK_TYPED(TimerHdl, Idle *, void);
ScChartListenerCollection& operator=( const ScChartListenerCollection& ) SAL_DELETED_FUNCTION;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 910f4d2ee884..0a30c7b4f949 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1890,7 +1890,7 @@ private:
SCCOLROW nEndCol, SCCOLROW* pTranslate,
ScProgress* pProgress, sal_uLong nProAdd );
- DECL_LINK(TrackTimeHdl, void *);
+ DECL_LINK_TYPED(TrackTimeHdl, Idle *, void);
static ScRecursionHelper* CreateRecursionHelperInstance();
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 82ea4e3edacd..d51d100a4e8b 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -132,7 +132,7 @@ public:
// moved by the application
DECL_LINK_TYPED( IdleHandler, Timer*, void ); // Timer instead of idle
- DECL_LINK( SpellTimerHdl, void* );
+ DECL_LINK_TYPED( SpellTimerHdl, Idle*, void );
DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
void Execute( SfxRequest& rReq );
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 05274b57691c..01721b6b0616 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -329,7 +329,7 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack )
pChangeTrack = pTrack;
}
-IMPL_LINK_NOARG(ScDocument, TrackTimeHdl)
+IMPL_LINK_NOARG_TYPED(ScDocument, TrackTimeHdl, Idle *, void)
{
if ( ScDdeLink::IsInUpdate() ) // do not nest
{
@@ -353,8 +353,6 @@ IMPL_LINK_NOARG(ScDocument, TrackTimeHdl)
}
}
}
-
- return 0;
}
void ScDocument::SetExpandRefs( bool bVal )
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 9d80f65edd37..df74b9c3dafe 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -593,15 +593,14 @@ void ScChartListenerCollection::StartTimer()
aIdle.Start();
}
-IMPL_LINK_NOARG(ScChartListenerCollection, TimerHdl)
+IMPL_LINK_NOARG_TYPED(ScChartListenerCollection, TimerHdl, Idle *, void)
{
if ( Application::AnyInput( VclInputFlags::KEYBOARD ) )
{
aIdle.Start();
- return 0;
+ return;
}
UpdateDirtyCharts();
- return 0;
}
void ScChartListenerCollection::UpdateDirtyCharts()
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 4a5cf93dc110..48a3ad1c3574 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1942,12 +1942,12 @@ IMPL_LINK_NOARG_TYPED(ScModule, IdleHandler, Timer *, void)
aIdleTimer.Start();
}
-IMPL_LINK_NOARG(ScModule, SpellTimerHdl)
+IMPL_LINK_NOARG_TYPED(ScModule, SpellTimerHdl, Idle *, void)
{
if ( Application::AnyInput( VclInputFlags::KEYBOARD ) )
{
aSpellIdle.Start();
- return 0; // Later again ...
+ return; // Later again ...
}
ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>(SfxViewShell::Current());
@@ -1956,7 +1956,6 @@ IMPL_LINK_NOARG(ScModule, SpellTimerHdl)
if (pViewSh->ContinueOnlineSpelling())
aSpellIdle.Start();
}
- return 0;
}
/**
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 120669101b1b..4cf0a86013d1 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -402,7 +402,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
return 0;
}
-IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle )
+IMPL_LINK_TYPED( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void )
{
// alle 50ms nachschauen, ob RefInputMode noch stimmt
@@ -426,8 +426,6 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle )
}
pIdle->Start();
-
- return 0;
}
IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb )
diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index 37f139347c41..ed81680c54f2 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -100,7 +100,7 @@ void ScAutoStyleList::AddInitial( const ScRange& rRange, const OUString& rStyle1
aInitIdle.Start();
}
-IMPL_LINK_NOARG(ScAutoStyleList, InitHdl)
+IMPL_LINK_NOARG_TYPED(ScAutoStyleList, InitHdl, Idle *, void)
{
boost::ptr_vector<ScAutoStyleInitData>::iterator iter;
for (iter = aInitials.begin(); iter != aInitials.end(); ++iter)
@@ -114,8 +114,6 @@ IMPL_LINK_NOARG(ScAutoStyleList, InitHdl)
}
aInitials.clear();
-
- return 0;
}
void ScAutoStyleList::AddEntry( sal_uLong nTimeout, const ScRange& rRange, const OUString& rStyle )
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 96ae3c0ac2c3..783891459687 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -1014,11 +1014,10 @@ void ScFunctionDockWin::ToggleFloatingMode()
aIdle.Start();
}
-IMPL_LINK_NOARG(ScFunctionDockWin, TimerHdl)
+IMPL_LINK_NOARG_TYPED(ScFunctionDockWin, TimerHdl, Idle *, void)
{
CheckAlignment(eSfxOldAlignment,eSfxNewAlignment);
SetSize();
- return 0;
}
void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo)
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index c8252fd9db0b..96d43e3efd36 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -148,10 +148,10 @@ private:
DECL_LINK( SelectHandle, void*);
DECL_LINK( RefInfoHandle, OUString*);
- DECL_LINK( UpdateSelectionHdl, void*);
+ DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void );
DECL_LINK( ChgTrackModHdl, ScChangeTrack*);
DECL_LINK( CommandHdl, void*);
- DECL_LINK( ReOpenTimerHdl, void*);
+ DECL_LINK_TYPED( ReOpenTimerHdl, Idle*, void );
DECL_LINK( ColCompareHdl, SvSortData*);
protected:
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 0c2363a0b5a1..eef11c9b442c 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -124,7 +124,7 @@ private:
Idle aIdle;
OUString aDocName; // document on which the dialog was opened
- DECL_LINK( UpdateFocusHdl, void* );
+ DECL_LINK_TYPED( UpdateFocusHdl, Idle*, void );
protected:
bool DoClose( sal_uInt16 nId );
diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx
index b1659f5b4438..dcc3da713d2f 100644
--- a/sc/source/ui/inc/autostyl.hxx
+++ b/sc/source/ui/inc/autostyl.hxx
@@ -45,7 +45,7 @@ private:
void AdjustEntries(sal_uLong nDiff);
void StartTimer(sal_uLong nNow);
DECL_LINK_TYPED( TimerHdl, Timer*, void );
- DECL_LINK( InitHdl, void* );
+ DECL_LINK_TYPED( InitHdl, Idle*, void );
public:
ScAutoStyleList(ScDocShell* pShell);
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index 229c12055b42..03e6e831b271 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -151,7 +151,7 @@ private:
DECL_LINK( SelectHandle, void* );
DECL_LINK( DeselectHandle, void* );
- DECL_LINK( UpdateSelectionHdl, void* );
+ DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void );
DECL_LINK( KeepMineHandle, void* );
DECL_LINK( KeepOtherHandle, void* );
DECL_LINK( KeepAllMineHandle, void* );
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index bef700938a8f..a3450cfc4133 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -84,7 +84,7 @@ private:
DECL_LINK( SetSelectionHdl, void* );
DECL_LINK( SelHdl, ListBox* );
DECL_LINK(SetSplitHdl,ScPrivatSplit*);
- DECL_LINK( TimerHdl, void*);
+ DECL_LINK_TYPED( TimerHdl, Idle*, void );
protected:
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index e7cdc96ee775..693d12848731 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -222,7 +222,7 @@ private:
DECL_LINK( ScrollHdl, ScrollBar* );
// Hack: RefInput control
- DECL_LINK( TimeOutHdl, Idle* );
+ DECL_LINK_TYPED( TimeOutHdl, Idle*, 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 cb23e7ab61b9..e7296250b1b9 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -258,7 +258,7 @@ private:
ScNavigatorControllerItem** ppBoundItems;
- DECL_LINK( TimeHdl, Idle* );
+ DECL_LINK_TYPED( TimeHdl, Idle*, void );
void DoResize();
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index cd4d3bfb74e2..19cc96c96b87 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -107,7 +107,7 @@ private:
sal_uInt16 nSelected;
OString aSelectedIdent;
- SAL_DLLPRIVATE DECL_LINK( TimerHdl, void*);
+ DECL_DLLPRIVATE_LINK_TYPED( TimerHdl, Idle*, void );
protected:
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index f8011b957a44..71d7d2e7f72d 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1637,16 +1637,14 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack)
return 0;
}
-IMPL_LINK_NOARG(ScAcceptChgDlg, ReOpenTimerHdl)
+IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, ReOpenTimerHdl, Idle *, void)
{
ScSimpleRefDlgWrapper::SetAutoReOpen(true);
m_pAcceptChgCtr->ShowFilterPage();
RefHandle(NULL);
-
- return 0;
}
-IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl)
+IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, UpdateSelectionHdl, Idle *, void)
{
ScTabView* pTabView = pViewData->GetView();
@@ -1692,8 +1690,6 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl)
bool bEnable = pDoc->IsDocEditable() && pChanges && !pChanges->IsProtected();
pTPView->EnableAccept( bAcceptFlag && bEnable );
pTPView->EnableReject( bRejectFlag && bEnable );
-
- return 0;
}
IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl)
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 6ea1343fc242..a1a6407b3602 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -964,13 +964,12 @@ void ScRefHandler::stateChanged(const StateChangedType nStateChange, const bool
}
}
-IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl)
+IMPL_LINK_NOARG_TYPED(ScRefHandler, UpdateFocusHdl, Idle *, void)
{
if (pActiveWin)
{
pActiveWin->GrabFocus();
}
- return 0;
}
bool ScRefHandler::ParseWithNames( ScRangeList& rRanges, const OUString& rStr, ScDocument* pDoc )
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 9c0b55637cb6..a7c46448e2b4 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -566,11 +566,11 @@ IMPL_LINK_NOARG(ScConflictsDlg, DeselectHandle)
return 0;
}
-IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl)
+IMPL_LINK_NOARG_TYPED(ScConflictsDlg, UpdateSelectionHdl, Idle *, void)
{
if ( !mpViewData || !mpOwnDoc )
{
- return 0;
+ return;
}
ScTabView* pTabView = mpViewData->GetView();
@@ -600,8 +600,6 @@ IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl)
}
pEntry = m_pLbConflicts->NextSelected( pEntry );
}
-
- return 0;
}
void ScConflictsDlg::SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictAction eConflictAction )
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 02fc9c1a8ac7..ab073e168d2f 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -893,13 +893,12 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
-IMPL_LINK( ScNavigatorDlg, TimeHdl, Idle*, pIdle )
+IMPL_LINK_TYPED( ScNavigatorDlg, TimeHdl, Idle*, pIdle, void )
{
if ( pIdle != &aContentIdle )
- return 0;
+ return;
aLbEntries->Refresh( SC_CONTENT_NOTE );
- return 0;
}
void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew)
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index c087920e98cd..175d3c717780 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -368,14 +368,14 @@ void ScExtIButton::MouseButtonDown( const MouseEvent& rMEvt )
void ScExtIButton::MouseButtonUp( const MouseEvent& rMEvt)
{
aIdle.Stop();
- aIdle.SetIdleHdl(Link<>());
+ aIdle.SetIdleHdl(Link<Idle *, void>());
ImageButton::MouseButtonUp(rMEvt );
}
void ScExtIButton::Click()
{
aIdle.Stop();
- aIdle.SetIdleHdl(Link<>());
+ aIdle.SetIdleHdl(Link<Idle *, void>());
ImageButton::Click();
}
@@ -414,10 +414,9 @@ bool ScExtIButton::PreNotify( NotifyEvent& rNEvt )
return ImageButton::PreNotify(rNEvt );
}
-IMPL_LINK_NOARG(ScExtIButton, TimerHdl)
+IMPL_LINK_NOARG_TYPED(ScExtIButton, TimerHdl, Idle *, void)
{
StartPopup();
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */