dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2 +- desktop/win32/source/loader.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 4da2ad58a6460cec4324431f0bf301de1603b748 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Tue Oct 1 10:00:24 2019 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Tue Oct 1 13:19:37 2019 +0200 loplugin:nullptr (clang-cl) Change-Id: I9a9262a236d4257da6f65ee6b0cafbc5522c8a66 Reviewed-on: https://gerrit.libreoffice.org/79917 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 1e7bbf1f7a9a..f5a41a5d701f 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -273,7 +273,7 @@ namespace dbaui { OUString sOldDataSource=getURLNoPrefix(); OUString sNewDataSource; - HWND hWnd = 0; + HWND hWnd = nullptr; weld::Window* pDialog = GetFrameWeld(); css::uno::Reference<css::awt::XSystemDependentWindowPeer> xSysDepWin(pDialog->GetXWindow(), css::uno::UNO_QUERY); diff --git a/desktop/win32/source/loader.cxx b/desktop/win32/source/loader.cxx index 6eab8ddaf24a..40cef9e3fd4f 100644 --- a/desktop/win32/source/loader.cxx +++ b/desktop/win32/source/loader.cxx @@ -191,7 +191,7 @@ int officeloader_impl(bool bAllowConsole) } // create a Windows JobObject with a memory limit - HANDLE hJobObject = NULL; + HANDLE hJobObject = nullptr; if (nMaxMemoryInMB > 0) { JOBOBJECT_EXTENDED_LIMIT_INFORMATION aJobLimit; @@ -199,8 +199,8 @@ int officeloader_impl(bool bAllowConsole) if (bExcludeChildProcesses) aJobLimit.BasicLimitInformation.LimitFlags |= JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; aJobLimit.JobMemoryLimit = nMaxMemoryInMB * 1024 * 1024; - hJobObject = CreateJobObjectW(NULL, NULL); - if (hJobObject != NULL) + hJobObject = CreateJobObjectW(nullptr, nullptr); + if (hJobObject != nullptr) SetInformationJobObject(hJobObject, JobObjectExtendedLimitInformation, &aJobLimit, sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION)); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits