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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Sep 12 05:53:27 UTC 2018


 fpicker/source/win32/VistaFilePickerImpl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e87143222934ee730806be9f8f7d083133566ad7
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Sep 11 16:51:57 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Sep 12 07:53:04 2018 +0200

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

diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx b/fpicker/source/win32/VistaFilePickerImpl.cxx
index 533c8b0242b7..d4a9915a5dd5 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -125,7 +125,7 @@ OUString lcl_getURLFromShellItem (IShellItem* pItem)
         hr = IIDFromString(aStr.c_str(), &known_folder_id);
         if (SUCCEEDED(hr))
         {
-            hr = SHGetKnownFolderPath(known_folder_id, 0, NULL, &pStr);
+            hr = SHGetKnownFolderPath(known_folder_id, 0, nullptr, &pStr);
             if (SUCCEEDED(hr))
             {
                 ::osl::FileBase::getFileURLFromSystemPath(o3tl::toU(pStr), sURL);
@@ -135,7 +135,7 @@ OUString lcl_getURLFromShellItem (IShellItem* pItem)
     }
 
     // Default fallback
-    hr = SHGetKnownFolderPath(FOLDERID_Documents, 0, NULL, &pStr);
+    hr = SHGetKnownFolderPath(FOLDERID_Documents, 0, nullptr, &pStr);
     if (SUCCEEDED(hr))
         ::osl::FileBase::getFileURLFromSystemPath(o3tl::toU(pStr), sURL);
     else // shouldn't happen...


More information about the Libreoffice-commits mailing list