[Libreoffice-commits] core.git: extensions/source

[Stephan Bergmann]

 extensions/source/scanner/scanwin.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b3ef638cb25c2d09112f58b182fdb0e458e3dfa8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 9 18:09:10 2018 +0100

    Various loplugin (clang-cl)
    
    Change-Id: Ib91d9f82b99989a37e5e03ecb9138a59436ce2c8
    Reviewed-on: https://gerrit.libreoffice.org/47674
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 56a45b2dcf73..02ce3425d01a 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -431,7 +431,7 @@ void ImpTwain::ImplXfer()
     if( nCurState == 6 )
     {
         TW_IMAGEINFO    aInfo;
-        HANDLE          hDIB = 0;
+        HANDLE          hDIB = nullptr;
         long            nWidth, nHeight, nXRes, nYRes;
 
         if( PFUNC( &aAppIdent, &aSrcIdent, DG_IMAGE, DAT_IMAGEINFO, MSG_GET, &aInfo ) == TWRC_SUCCESS )
@@ -463,13 +463,13 @@ void ImpTwain::ImplXfer()
                         pBIH->biXPelsPerMeter = FRound( fFactor * nXRes );
                         pBIH->biYPelsPerMeter = FRound( fFactor * nYRes );
 
-                        GlobalUnlock( reinterpret_cast<HGLOBAL>((sal_IntPtr) hDIB) );
+                        GlobalUnlock( static_cast<HGLOBAL>(hDIB) );
                     }
 
-                    mrMgr.SetData( reinterpret_cast<void*>((sal_IntPtr) hDIB) );
+                    mrMgr.SetData( static_cast<void*>(hDIB) );
                 }
                 else
-                    GlobalFree( reinterpret_cast<HGLOBAL>((sal_IntPtr) hDIB) );
+                    GlobalFree( static_cast<HGLOBAL>(hDIB) );
 
                 nCurState = 7;
             }