bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx | 4 ++-- bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 6d21e8d651ace0704e954bb13bdc8f67c17b1a41 Author: Juergen Funk <juergen.funk...@cib.de> AuthorDate: Mon May 27 12:36:44 2019 +0200 Commit: Michael Stahl <michael.st...@cib.de> CommitDate: Fri May 31 11:26:51 2019 +0200 Replace 0 in nullptr Change-Id: I517a036ccf41c377fee78f841f474b72998bd9ac Reviewed-on: https://gerrit.libreoffice.org/73028 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx index 01967af8bf43..a5e0e53580ac 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx @@ -55,8 +55,8 @@ static inline typelib_TypeClass cpp2uno_call( TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); } - void * pUnoReturn = 0; - void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need + void * pUnoReturn = nullptr; + void * pCppReturn = nullptr; // complex return ptr: if != 0 && != pUnoReturn, reconversion need if (pReturnTypeDescr) { diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx index d5c89ca78985..f215a92e9078 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx @@ -150,7 +150,7 @@ static void cpp_call( TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); assert(pReturnTypeDescr); - void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion + void * pCppReturn = nullptr; // if != 0 && != pUnoReturn, needs reconversion if (pReturnTypeDescr) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits