diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-08-24 23:45:08 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-08-27 15:11:31 +0200 |
| commit | 4c356a3e5eafea92856824f902181b59ffed4fcc (patch) | |
| tree | 2fd85f6fbb1fa6e40387da2e7a5d3600cc50a256 /vcl/win | |
| parent | e8cb36fd6234270c8c31147db35cccab9c234529 (diff) | |
WIN ignore the timer results
Nobody else will handle our scheduler or WM_TIMER event, so
there is really no point to return any error value from the
handlers to some lower level function.
Change-Id: I33eac11076a30220cfa11cec8f352bd5c8b69209
Reviewed-on: https://gerrit.libreoffice.org/59588
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/app/salinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/app/saltimer.cxx | 10 |
2 files changed, 6 insertions, 8 deletions
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: */ |