summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/newhelp.cxx5
-rw-r--r--sfx2/source/appl/newhelp.hxx2
-rw-r--r--sfx2/source/control/bindings.cxx29
-rw-r--r--sfx2/source/dialog/splitwin.cxx6
-rw-r--r--sfx2/source/inc/splitwin.hxx2
-rw-r--r--sfx2/source/view/ipclient.cxx5
6 files changed, 23 insertions, 26 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index a1e8f4ccdb1e..488d0cc26e44 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -565,7 +565,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Im
get(m_pOpenBtn, "display");
m_pOpenBtn->SetClickHdl( LINK( this, IndexTabPage_Impl, OpenHdl ) );
- Link<> aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl );
+ Link<Timer *, void> aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl );
aFactoryIdle.SetIdleHdl( LINK(this, IndexTabPage_Impl, IdleHdl ));
aFactoryIdle.SetPriority(SchedulerPriority::LOWER);
aKeywordTimer.SetTimeoutHdl( aTimeoutLink );
@@ -750,11 +750,10 @@ IMPL_LINK( IndexTabPage_Impl, IdleHdl, Idle*, pIdle )
return 0;
}
-IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer)
+IMPL_LINK_TYPED( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer, void)
{
if(&aKeywordTimer == pTimer && !sKeyword.isEmpty())
aKeywordLink.Call(this);
- return 0;
}
void IndexTabPage_Impl::ActivatePage()
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index bf87d9226c96..f72cdd1048a6 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -140,7 +140,7 @@ private:
DECL_LINK(OpenHdl, void *);
DECL_LINK(IdleHdl, Idle* );
- DECL_LINK(TimeoutHdl, Timer*);
+ DECL_LINK_TYPED(TimeoutHdl, Timer*, void);
public:
IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin );
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 3e72e8d6178b..3d696cb23cdd 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -179,10 +179,10 @@ public:
aTimer.Start();
}
- DECL_LINK( TimerHdl, Timer*);
+ DECL_LINK_TYPED( TimerHdl, Timer*, void);
};
-IMPL_LINK(SfxAsyncExec_Impl, TimerHdl, Timer*, pTimer)
+IMPL_LINK_TYPED(SfxAsyncExec_Impl, TimerHdl, Timer*, pTimer, void)
{
(void)pTimer; // unused
aTimer.Stop();
@@ -191,7 +191,6 @@ IMPL_LINK(SfxAsyncExec_Impl, TimerHdl, Timer*, pTimer)
xDisp->dispatch( aCommand, aSeq );
delete this;
- return 0L;
}
enum class SfxPopupAction
@@ -257,7 +256,7 @@ SfxBindings::SfxBindings()
// all caches are valid (no pending invalidate-job)
// create the list of caches
pImp->pCaches = new SfxStateCacheArr_Impl;
- pImp->aTimer.SetTimeoutHdl( LINK(this, SfxBindings, NextJob_Impl) );
+ pImp->aTimer.SetTimeoutHdl( LINK(this, SfxBindings, NextJob) );
}
@@ -1554,10 +1553,12 @@ void SfxBindings::UpdateControllers_Impl
}
}
+IMPL_LINK_TYPED( SfxBindings, NextJob, Timer *, pTimer, void )
+{
+ NextJob_Impl(pTimer);
+}
-
-
-IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
+bool SfxBindings::NextJob_Impl(Timer * pTimer)
{
#ifdef DBG_UTIL
// on Windows very often C++ Exceptions (GPF etc.) are caught by MSVCRT
@@ -1572,7 +1573,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
if ( Application::GetLastInputInterval() < MAX_INPUT_DELAY && pTimer )
{
pImp->aTimer.SetTimeout(TIMEOUT_UPDATING);
- return sal_True;
+ return true;
}
SfxApplication *pSfxApp = SfxGetpApp();
@@ -1584,18 +1585,18 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
SfxViewFrame* pFrame = pDispatcher ? pDispatcher->GetFrame() : NULL;
if ( (pFrame && !pFrame->GetObjectShell()->AcceptStateUpdate()) || pSfxApp->IsDowning() || pImp->pCaches->empty() )
{
- return sal_True;
+ return true;
}
if ( !pDispatcher || !pDispatcher->IsFlushed() )
{
- return sal_True;
+ return true;
}
// if possible Update all server / happens in its own time slice
if ( pImp->bMsgDirty )
{
UpdateSlotServer_Impl();
- return sal_False;
+ return false;
}
pImp->bAllDirty = false;
@@ -1640,7 +1641,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
if ( bWasDirty && !bJobDone && bPreEmptive && (--nLoops == 0) )
{
pImp->bInNextJob = false;
- return sal_False;
+ return false;
}
}
}
@@ -1668,7 +1669,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
// Update round is finished
pImp->bInNextJob = false;
Broadcast(SfxSimpleHint(SFX_HINT_UPDATEDONE));
- return sal_True;
+ return true;
#ifdef DBG_UTIL
}
catch (...)
@@ -1677,7 +1678,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
pImp->bInNextJob = false;
}
- return sal_False;
+ return false;
#endif
}
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index a3bcb853134c..fb56c2891897 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -962,7 +962,7 @@ void SfxSplitWindow::Command( const CommandEvent& rCEvt )
-IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
+IMPL_LINK_TYPED( SfxSplitWindow, TimerHdl, Timer*, pTimer, void)
{
if ( pTimer )
pTimer->Stop();
@@ -986,7 +986,7 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
// do nothing
pEmptyWin->aLastPos = GetPointerPosPixel();
pEmptyWin->aTimer.Start();
- return 0L;
+ return;
}
// Especially for TF_AUTOSHOW_ON_MOUSEMOVE :
@@ -1029,8 +1029,6 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
}
}
}
-
- return 0L;
}
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index 177bd769c70c..bc21c05853a9 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -58,7 +58,7 @@ private:
sal_uInt16 nPos,
bool bNewLine=false );
- DECL_LINK( TimerHdl, Timer* );
+ DECL_LINK_TYPED( TimerHdl, Timer*, void );
bool CursorIsOverRect( bool bForceAdding = false ) const;
void SetPinned_Impl( bool );
void SetFadeIn_Impl( bool );
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 05cce6e5c097..5a30bbab54c2 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -123,7 +123,7 @@ public:
virtual ~SfxInPlaceClient_Impl();
void SizeHasChanged();
- DECL_LINK(TimerHdl, void *);
+ DECL_LINK_TYPED(TimerHdl, Timer *, void);
uno::Reference < frame::XFrame > GetFrame() const;
// XEmbeddedClient
@@ -591,11 +591,10 @@ void SfxInPlaceClient_Impl::SizeHasChanged()
}
-IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl)
+IMPL_LINK_NOARG_TYPED(SfxInPlaceClient_Impl, TimerHdl, Timer *, void)
{
if ( m_pClient && m_xObject.is() )
m_pClient->GetViewShell()->CheckIPClient_Impl( m_pClient, m_pClient->GetViewShell()->GetObjectShell()->GetVisArea() );
- return 0;
}
generated by cgit (git 2.34.1) at 2025-01-12 13:40:02 +0000