[Libreoffice-commits] core.git: desktop/source vcl/opengl

[Stephan Bergmann]

 desktop/source/app/cmdlinehelp.cxx |    6 +++---
 vcl/opengl/win/gdiimpl.cxx         |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 704fbec2bfac21d44a988d593cdb8de172bc8f10
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 16 15:21:04 2016 +0100

    loplugin:nullptr (clang-cl)
    
    Change-Id: I557e752ca05146e2a571d027fc3d1875afd6ef26

diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index cd0d46d..6103c90 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -178,19 +178,19 @@ namespace desktop
                 int fileHandle = _open_osfhandle(stdHandle, _O_TEXT);
                 FILE *fp = _fdopen(fileHandle, "r");
                 *stdin = *fp;
-                setvbuf(stdin, NULL, _IONBF, 0);
+                setvbuf(stdin, nullptr, _IONBF, 0);
                 // stdout
                 stdHandle = reinterpret_cast<intptr_t>(GetStdHandle(STD_OUTPUT_HANDLE));
                 fileHandle = _open_osfhandle(stdHandle, _O_TEXT);
                 fp = _fdopen(fileHandle, "w");
                 *stdout = *fp;
-                setvbuf(stdout, NULL, _IONBF, 0);
+                setvbuf(stdout, nullptr, _IONBF, 0);
                 // stderr
                 stdHandle = reinterpret_cast<intptr_t>(GetStdHandle(STD_ERROR_HANDLE));
                 fileHandle = _open_osfhandle(stdHandle, _O_TEXT);
                 fp = _fdopen(fileHandle, "w");
                 *stderr = *fp;
-                setvbuf(stderr, NULL, _IONBF, 0);
+                setvbuf(stderr, nullptr, _IONBF, 0);
             }
 
             ~lcl_Console()
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 0d0159d..89e595c 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -566,7 +566,7 @@ bool WinOpenGLContext::ImplInit()
 
     if (!InitGL())
     {
-        wglMakeCurrent(NULL, NULL);
+        wglMakeCurrent(nullptr, nullptr);
         g_bAnyCurrent = false;
         wglDeleteContext(hTempRC);
         return false;