vcl/win/app/saltimer.cxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
New commits: commit 858f7dfdae9b37e2cf588ee6f2015d2fd773c501 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Mar 2 10:00:52 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Mar 2 16:06:39 2026 +0100 vcl: fix warning C4189: 'pSalData': local variable... ...is initialized but not referenced Since commit 12a18cc38029c0cc70ec6aa99430fb700c870c9c Author: Michael Weghorn <[email protected]> Date: Fri Feb 27 08:56:49 2026 +0000 vcl Win: Don't store WinSalInstance also in SalData Change-Id: I19161c582b1fc6324330faf6157c31cb20a683c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200772 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx index 9b0f6be01644..2400899027fc 100644 --- a/vcl/win/app/saltimer.cxx +++ b/vcl/win/app/saltimer.cxx @@ -38,9 +38,8 @@ void CALLBACK SalTimerProc(PVOID pParameter, BOOLEAN bTimerOrWaitFired); // this must run on the main thread too void WinSalTimer::ImplStop() { - SalData *const pSalData = GetSalData(); const WinSalInstance *pInst = GetWinSalInstance(); - assert( !pInst || pSalData->mnAppThreadId == GetCurrentThreadId() ); + assert( !pInst || GetSalData()->mnAppThreadId == GetCurrentThreadId() ); if ( m_bSetTimerRunning ) { @@ -63,10 +62,7 @@ void WinSalTimer::ImplStop() void WinSalTimer::ImplStart( sal_uInt64 nMS ) { -#if !defined NDEBUG - SalData* pSalData = GetSalData(); - assert(!GetWinSalInstance() || pSalData->mnAppThreadId == GetCurrentThreadId()); -#endif + assert(!GetWinSalInstance() || GetSalData()->mnAppThreadId == GetCurrentThreadId()); // DueTime parameter is a DWORD, which is always an unsigned 32bit if (nMS > SAL_MAX_UINT32)
