Kaydet (Commit) 4c356a3e authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski

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: 's avatarJan-Marek Glogowski <glogow@fbihome.de>
üst e8cb36fd
...@@ -42,9 +42,9 @@ class WinSalTimer final : public SalTimer, protected VersionedEvent ...@@ -42,9 +42,9 @@ class WinSalTimer final : public SalTimer, protected VersionedEvent
void ImplStart( sal_uIntPtr nMS ); void ImplStart( sal_uIntPtr nMS );
void ImplStop(); void ImplStop();
bool ImplHandleTimerEvent( WPARAM aWPARAM ); void ImplHandleTimerEvent( WPARAM aWPARAM );
void ImplHandleElapsedTimer(); void ImplHandleElapsedTimer();
bool ImplHandle_WM_TIMER( WPARAM aWPARAM ); void ImplHandle_WM_TIMER( WPARAM aWPARAM );
public: public:
WinSalTimer(); WinSalTimer();
......
...@@ -661,12 +661,12 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, b ...@@ -661,12 +661,12 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, b
case SAL_MSG_TIMER_CALLBACK: case SAL_MSG_TIMER_CALLBACK:
assert( pTimer != nullptr ); assert( pTimer != nullptr );
nRet = static_cast<LRESULT>( pTimer->ImplHandleTimerEvent( wParam ) ); pTimer->ImplHandleTimerEvent( wParam );
break; break;
case WM_TIMER: case WM_TIMER:
assert( pTimer != nullptr ); assert( pTimer != nullptr );
nRet = static_cast<LRESULT>( pTimer->ImplHandle_WM_TIMER( wParam ) ); pTimer->ImplHandle_WM_TIMER( wParam );
break; break;
case SAL_MSG_DUMMY: case SAL_MSG_DUMMY:
......
...@@ -159,14 +159,13 @@ void WinSalTimer::ImplHandleElapsedTimer() ...@@ -159,14 +159,13 @@ void WinSalTimer::ImplHandleElapsedTimer()
ImplSalYieldMutexRelease(); ImplSalYieldMutexRelease();
} }
bool WinSalTimer::ImplHandleTimerEvent( const WPARAM aWPARAM ) void WinSalTimer::ImplHandleTimerEvent( const WPARAM aWPARAM )
{ {
assert( aWPARAM <= SAL_MAX_INT32 ); assert( aWPARAM <= SAL_MAX_INT32 );
if ( !IsValidEventVersion( static_cast<sal_Int32>( aWPARAM ) ) ) if ( !IsValidEventVersion( static_cast<sal_Int32>( aWPARAM ) ) )
return false; return;
ImplHandleElapsedTimer(); ImplHandleElapsedTimer();
return true;
} }
void WinSalTimer::SetForceRealTimer( const bool bVal ) void WinSalTimer::SetForceRealTimer( const bool bVal )
...@@ -181,14 +180,13 @@ void WinSalTimer::SetForceRealTimer( const bool bVal ) ...@@ -181,14 +180,13 @@ void WinSalTimer::SetForceRealTimer( const bool bVal )
Start( 0 ); Start( 0 );
} }
bool WinSalTimer::ImplHandle_WM_TIMER( const WPARAM aWPARAM ) void WinSalTimer::ImplHandle_WM_TIMER( const WPARAM aWPARAM )
{ {
assert( m_aWmTimerId == aWPARAM ); assert( m_aWmTimerId == aWPARAM );
if ( !(m_aWmTimerId == aWPARAM && m_bDirectTimeout && m_bForceRealTimer) ) if ( !(m_aWmTimerId == aWPARAM && m_bDirectTimeout && m_bForceRealTimer) )
return false; return;
ImplHandleElapsedTimer(); ImplHandleElapsedTimer();
return true;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment