diff options
| -rw-r--r-- | vcl/inc/win/saltimer.h | 4 | ||||
| -rw-r--r-- | vcl/win/app/salinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/app/saltimer.cxx | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/vcl/inc/win/saltimer.h b/vcl/inc/win/saltimer.h index 61d284d82ddb..e3fc25a3f542 100644 --- a/vcl/inc/win/saltimer.h +++ b/vcl/inc/win/saltimer.h @@ -42,9 +42,9 @@ class WinSalTimer final : public SalTimer, protected VersionedEvent void ImplStart( sal_uIntPtr nMS ); void ImplStop(); - bool ImplHandleTimerEvent( WPARAM aWPARAM ); + void ImplHandleTimerEvent( WPARAM aWPARAM ); void ImplHandleElapsedTimer(); - bool ImplHandle_WM_TIMER( WPARAM aWPARAM ); + void ImplHandle_WM_TIMER( WPARAM aWPARAM ); public: WinSalTimer(); diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 75044a5e00d3..af97c82f752e 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -661,12 +661,12 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, b case SAL_MSG_TIMER_CALLBACK: assert( pTimer != nullptr ); - nRet = static_cast<LRESULT>( pTimer->ImplHandleTimerEvent( wParam ) ); + pTimer->ImplHandleTimerEvent( wParam ); break; case WM_TIMER: assert( pTimer != nullptr ); - nRet = static_cast<LRESULT>( pTimer->ImplHandle_WM_TIMER( wParam ) ); + pTimer->ImplHandle_WM_TIMER( wParam ); break; case SAL_MSG_DUMMY: diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx index 689c055a55f5..17478bf58fdd 100644 --- a/vcl/win/app/saltimer.cxx +++ b/vcl/win/app/saltimer.cxx @@ -159,14 +159,13 @@ void WinSalTimer::ImplHandleElapsedTimer() ImplSalYieldMutexRelease(); } -bool WinSalTimer::ImplHandleTimerEvent( const WPARAM aWPARAM ) +void WinSalTimer::ImplHandleTimerEvent( const WPARAM aWPARAM ) { assert( aWPARAM <= SAL_MAX_INT32 ); if ( !IsValidEventVersion( static_cast<sal_Int32>( aWPARAM ) ) ) - return false; + return; ImplHandleElapsedTimer(); - return true; } void WinSalTimer::SetForceRealTimer( const bool bVal ) @@ -181,14 +180,13 @@ void WinSalTimer::SetForceRealTimer( const bool bVal ) Start( 0 ); } -bool WinSalTimer::ImplHandle_WM_TIMER( const WPARAM aWPARAM ) +void WinSalTimer::ImplHandle_WM_TIMER( const WPARAM aWPARAM ) { assert( m_aWmTimerId == aWPARAM ); if ( !(m_aWmTimerId == aWPARAM && m_bDirectTimeout && m_bForceRealTimer) ) - return false; + return; ImplHandleElapsedTimer(); - return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |