vcl/source/app/scheduler.cxx | 3 ++-
vcl/source/treelist/svimpbox.cxx | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit d837fb6ce95a598627c4863bb7d99e827d5309f7
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Aug 12 10:41:58 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Aug 12 13:11:47 2020 +0200
expand out DELETEZ in vcl
Change-Id: Ibcaef8c5dd057cb9b1711440e5f9da43817078f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100587
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index fa18087e9fd8..e8ad527ec949 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -132,7 +132,8 @@ void Scheduler::ImplDeInitScheduler()
assert( 1 == rSchedCtx.maMutex.lockDepth() );
if (rSchedCtx.mpSalTimer) rSchedCtx.mpSalTimer->Stop();
- DELETEZ( rSchedCtx.mpSalTimer );
+ delete rSchedCtx.mpSalTimer;
+ rSchedCtx.mpSalTimer = nullptr;
#if OSL_DEBUG_LEVEL > 0
sal_uInt32 nActiveTasks = 0, nIgnoredTasks = 0;
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 22a03342e153..2b4ed138305c 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -116,8 +116,10 @@ SvImpLBox::~SvImpLBox()
if ( osl_atomic_decrement(&s_nImageRefCount) == 0 )
{
- DELETEZ(s_pDefCollapsed);
- DELETEZ(s_pDefExpanded);
+ delete s_pDefCollapsed;
+ s_pDefCollapsed = nullptr;
+ delete s_pDefExpanded;
+ s_pDefExpanded = nullptr;
}
m_aVerSBar.disposeAndClear();
m_aHorSBar.disposeAndClear();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
