summaryrefslogtreecommitdiff
path: root/vcl/opengl/win
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-09-30 22:48:38 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-10-01 08:58:07 +0200
commitec737443c29f50fc9ce9452c58540442c6b34948 (patch)
tree640275d322a5ee6b59cd9cc9a208419531d3a9ab /vcl/opengl/win
parentf28473dd0aaab4aee3fbe60c915a554550c4d8b2 (diff)
loplugin:nullptr,redundantcast (clang-cl)
Change-Id: Ic173e38828b04fd177d62551e3323b816c73d556 Reviewed-on: https://gerrit.libreoffice.org/42980 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/opengl/win')
-rw-r--r--vcl/opengl/win/WinDeviceInfo.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index d885389b0510..841abed10748 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -206,7 +206,7 @@ int32_t WindowsOSVersion()
FreeLibrary(hLibrary);
if (dwCount != 0 && dwCount < SAL_N_ELEMENTS(szPath))
{
- dwCount = GetFileVersionInfoSizeW(szPath, NULL);
+ dwCount = GetFileVersionInfoSizeW(szPath, nullptr);
if (dwCount != 0)
{
std::unique_ptr<char> ver(new char[dwCount]);
@@ -216,7 +216,7 @@ int32_t WindowsOSVersion()
UINT dwBlockSz = 0;
if (VerQueryValueW(ver.get(), L"\\", &pBlock, &dwBlockSz) != FALSE && dwBlockSz >= sizeof(VS_FIXEDFILEINFO))
{
- VS_FIXEDFILEINFO *vinfo = reinterpret_cast<VS_FIXEDFILEINFO *>(pBlock);
+ VS_FIXEDFILEINFO *vinfo = static_cast<VS_FIXEDFILEINFO *>(pBlock);
winVersion = int32_t(vinfo->dwProductVersionMS);
}
}