[Libreoffice-commits] core.git: include/comphelper

[Stephan Bergmann]

 include/comphelper/windowsdebugoutput.hxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 8729e89765d548a2d3520f4b5a0fa9a51d33426b
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Fri Jun 1 11:47:58 2018 +0200

    loplugin:nullptr (clang-cl)
    
    Change-Id: Ic21436a2d71968b8fd01a55fd6c1b7bc07b70451
    Reviewed-on: https://gerrit.libreoffice.org/55172
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/include/comphelper/windowsdebugoutput.hxx 
b/include/comphelper/windowsdebugoutput.hxx
index a09ccd389af2..059dc1358015 100644
--- a/include/comphelper/windowsdebugoutput.hxx
+++ b/include/comphelper/windowsdebugoutput.hxx
@@ -52,13 +52,13 @@ inline std::basic_ostream<charT, traits>& 
operator<<(std::basic_ostream<charT, t
         std::wstring(pRiid));
 
     DWORD nSize;
-    if (RegGetValueW(HKEY_CLASSES_ROOT, 
std::wstring(L"CLSID\\").append(pRiid).data(), NULL,
-                     RRF_RT_REG_SZ, NULL, NULL, &nSize)
+    if (RegGetValueW(HKEY_CLASSES_ROOT, 
std::wstring(L"CLSID\\").append(pRiid).data(), nullptr,
+                     RRF_RT_REG_SZ, nullptr, nullptr, &nSize)
         == ERROR_SUCCESS)
     {
         std::vector<wchar_t> sValue(nSize / 2);
-        if (RegGetValueW(HKEY_CLASSES_ROOT, 
std::wstring(L"CLSID\\").append(pRiid).data(), NULL,
-                         RRF_RT_REG_SZ, NULL, sValue.data(), &nSize)
+        if (RegGetValueW(HKEY_CLASSES_ROOT, 
std::wstring(L"CLSID\\").append(pRiid).data(), nullptr,
+                         RRF_RT_REG_SZ, nullptr, sValue.data(), &nSize)
             == ERROR_SUCCESS)
         {
             stream << "=\""
@@ -68,12 +68,12 @@ inline std::basic_ostream<charT, traits>& 
operator<<(std::basic_ostream<charT, t
         }
     }
     else if (RegGetValueW(HKEY_CLASSES_ROOT, 
std::wstring(L"Interface\\").append(pRiid).data(),
-                          NULL, RRF_RT_REG_SZ, NULL, NULL, &nSize)
+                          nullptr, RRF_RT_REG_SZ, nullptr, nullptr, &nSize)
              == ERROR_SUCCESS)
     {
         std::vector<wchar_t> sValue(nSize / 2);
-        if (RegGetValueW(HKEY_CLASSES_ROOT, 
std::wstring(L"Interface\\").append(pRiid).data(), NULL,
-                         RRF_RT_REG_SZ, NULL, sValue.data(), &nSize)
+        if (RegGetValueW(HKEY_CLASSES_ROOT, 
std::wstring(L"Interface\\").append(pRiid).data(),
+                         nullptr, RRF_RT_REG_SZ, nullptr, sValue.data(), 
&nSize)
             == ERROR_SUCCESS)
         {
             stream << "=\""
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits