diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-14 16:44:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-15 07:59:13 +0000 |
| commit | 48b1c8898d2f5a54435d23c412a0c65b553ef46d (patch) | |
| tree | ef87e03b112f675718ee542d86d42ed7c8beb4fb /vcl/win/app/salshl.cxx | |
| parent | 613213240a84327a0a72bb5ee98cc88d50c1fd0e (diff) | |
clang-cl loplugin: vcl
Change-Id: I40f8a6fef9d66b28a1d72551a6873b041b38b09e
Reviewed-on: https://gerrit.libreoffice.org/29841
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/win/app/salshl.cxx')
| -rw-r--r-- | vcl/win/app/salshl.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/vcl/win/app/salshl.cxx b/vcl/win/app/salshl.cxx index d2213efd61a1..3c3c7103aa53 100644 --- a/vcl/win/app/salshl.cxx +++ b/vcl/win/app/salshl.cxx @@ -68,35 +68,35 @@ bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ) { rIcon = pSalIcon->hIcon; rSmallIcon = pSalIcon->hSmallIcon; - return (rSmallIcon != 0); + return (rSmallIcon != nullptr); } } // Try at first to load the icons from the application exe file - rIcon = (HICON)LoadImage( pSalData->mhInst, MAKEINTRESOURCE( nId ), + rIcon = static_cast<HICON>(LoadImage( pSalData->mhInst, MAKEINTRESOURCE( nId ), IMAGE_ICON, GetSystemMetrics( SM_CXICON ), GetSystemMetrics( SM_CYICON ), - LR_DEFAULTCOLOR ); + LR_DEFAULTCOLOR )); if ( !rIcon ) { // If the application don't provide these icons, then we try // to load the icon from the VCL resource - rIcon = (HICON)LoadImage( aSalShlData.mhInst, MAKEINTRESOURCE( nId ), + rIcon = static_cast<HICON>(LoadImage( aSalShlData.mhInst, MAKEINTRESOURCE( nId ), IMAGE_ICON, GetSystemMetrics( SM_CXICON ), GetSystemMetrics( SM_CYICON ), - LR_DEFAULTCOLOR ); + LR_DEFAULTCOLOR )); if ( rIcon ) { - rSmallIcon = (HICON)LoadImage( aSalShlData.mhInst, MAKEINTRESOURCE( nId ), + rSmallIcon = static_cast<HICON>(LoadImage( aSalShlData.mhInst, MAKEINTRESOURCE( nId ), IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), - LR_DEFAULTCOLOR ); + LR_DEFAULTCOLOR )); } else - rSmallIcon = 0; + rSmallIcon = nullptr; } else { - rSmallIcon = (HICON)LoadImage( pSalData->mhInst, MAKEINTRESOURCE( nId ), + rSmallIcon = static_cast<HICON>(LoadImage( pSalData->mhInst, MAKEINTRESOURCE( nId ), IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), - LR_DEFAULTCOLOR ); + LR_DEFAULTCOLOR )); } if( rIcon ) @@ -110,7 +110,7 @@ bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ) pSalData->mpFirstIcon = pSalIcon; } - return (rSmallIcon != 0); + return (rSmallIcon != nullptr); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |