[Libreoffice-commits] core.git: vcl/win

Stephan Bergmann sbergman at redhat.com
Mon Sep 25 13:25:12 UTC 2017


 vcl/win/app/saltimer.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 3f95a79da8688e2bd0a8631e030c2385abbfc65c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 25 15:24:12 2017 +0200

    -Werror,-Wint-to-void-pointer-cast, loplugin:cstylecast (clang-cl)
    
    Change-Id: Ib06849499e46eb76f8049fea304f80c771e94098

diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx
index eb6993c8659d..1e11a9c4dba5 100644
--- a/vcl/win/app/saltimer.cxx
+++ b/vcl/win/app/saltimer.cxx
@@ -76,7 +76,8 @@ void WinSalTimer::ImplStart( sal_uLong nMS )
     // to be 0 and should not hurt; also see
     // https://www.microsoft.com/msj/0499/pooling/pooling.aspx
     CreateTimerQueueTimer(&m_nTimerId, nullptr, SalTimerProc,
-                          (void*) m_nTimerStartTicks,
+                          reinterpret_cast<void*>(
+                              sal_uIntPtr(m_nTimerStartTicks)),
                           nMS, 0, WT_EXECUTEINTIMERTHREAD | WT_EXECUTEONLYONCE);
 }
 
@@ -131,7 +132,8 @@ static void CALLBACK SalTimerProc(PVOID data, BOOLEAN)
         // that happened during execution of the callback later directly from
         // the message queue
         BOOL const ret = PostMessageW(GetSalData()->mpFirstInstance->mhComWnd,
-                                      SAL_MSG_TIMER_CALLBACK, (WPARAM) data, 0);
+                                      SAL_MSG_TIMER_CALLBACK,
+                                      reinterpret_cast<WPARAM>(data), 0);
 #if OSL_DEBUG_LEVEL > 0
         if (0 == ret) // SEH prevents using SAL_WARN here?
             fputs("ERROR: PostMessage() failed!\n", stderr);


More information about the Libreoffice-commits mailing list