summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-09-30 09:50:53 +0200
committerStephan Bergmann <sbergman@redhat.com>2021-10-01 08:32:40 +0200
commit955ccb669c60cc29918c784d9c801ab1ac54fc22 (patch)
tree4e1e77d8f60ac652e5cf01a9fb2a13b2d53821d4
parent9a3d2258420c4c1cc322b4f1317317dcd7c0b1a1 (diff)
loplugin:nullptr (clang-cl)
Change-Id: I47ac4ff7d82eb5732ad54e3b42c18c3665c83b82 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122845 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--sal/cppunittester/cppunittester.cxx10
-rw-r--r--winaccessibility/inc/AccObjectManagerAgent.hxx4
2 files changed, 7 insertions, 7 deletions
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 3ec11a3ffc3a..5b886ea2189d 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -514,7 +514,7 @@ static void printStack( CONTEXT* ctx )
stack.AddrFrame.Mode = AddrModeFlat;
#endif
- SymInitialize( process, NULL, TRUE ); //load symbols
+ SymInitialize( process, nullptr, TRUE ); //load symbols
std::unique_ptr<IMAGEHLP_LINE64> line(new IMAGEHLP_LINE64);
line->SizeOfStruct = sizeof(IMAGEHLP_LINE64);
@@ -533,10 +533,10 @@ static void printStack( CONTEXT* ctx )
thread,
&stack,
ctx,
- NULL,
+ nullptr,
SymFunctionTableAccess64,
SymGetModuleBase64,
- NULL
+ nullptr
);
if( !result )
@@ -556,13 +556,13 @@ static void printStack( CONTEXT* ctx )
{
//failed to get line
printf("\tat %s, address 0x%0I64X.\n", pSymbol->Name, pSymbol->Address);
- hModule = NULL;
+ hModule = nullptr;
lstrcpyA(module,"");
GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
reinterpret_cast<LPCTSTR>(stack.AddrPC.Offset), &hModule);
//at least print module name
- if(hModule != NULL)GetModuleFileNameA(hModule,module,MaxNameLen);
+ if(hModule != nullptr)GetModuleFileNameA(hModule,module,MaxNameLen);
printf ("in %s\n",module);
}
diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx b/winaccessibility/inc/AccObjectManagerAgent.hxx
index e4e87be3dc3c..579a785b41bb 100644
--- a/winaccessibility/inc/AccObjectManagerAgent.hxx
+++ b/winaccessibility/inc/AccObjectManagerAgent.hxx
@@ -49,7 +49,7 @@ public:
virtual bool InsertAccObj(css::accessibility::XAccessible* pXAcc,
css::accessibility::XAccessible* pParentXAcc,
- HWND hWnd = 0);
+ HWND hWnd = nullptr);
virtual void GetIAccessibleFromResID(long childID,IMAccessible**);
virtual bool GetIAccessibleFromXAccessible(css::accessibility::XAccessible* pXAcc, IAccessible** ppIA);
@@ -59,7 +59,7 @@ public:
bool NotifyAccEvent(short pEvent = 0, css::accessibility::XAccessible* pXAcc = nullptr);
bool InsertChildrenAccObj(css::accessibility::XAccessible* pXAcc,
- HWND hWnd = 0);
+ HWND hWnd = nullptr);
void DeleteChildrenAccObj( css::accessibility::XAccessible* pXAcc );
void DecreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState );