sfx2/source/control/bindings.cxx | 5 ++++-
sfx2/source/control/statcach.cxx | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 0a8ce55f715156d72d38b4416ada33cd0d9b237f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Aug 12 13:24:36 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Aug 12 22:27:16 2020 +0200
expand out DELETEZ
Change-Id: I5460de0f54a0d7c1a18ce8f1fa33ef3405d8183c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100622
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 94b9fea11e4b..ce4d3a4230d4 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1591,7 +1591,10 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot,
std::unique_ptr<SfxPoolI
xBind->Release();
xBind.clear();
if ( bDeleteCache )
- DELETEZ( pCache );
+ {
+ delete pCache;
+ pCache = nullptr;
+ }
return eState;
}
}
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index dfdc10f83687..b71b96a62579 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -428,7 +428,10 @@ void SfxStateCache::SetState_Impl
// Remember new value
if ( !IsInvalidItem(pLastItem) )
- DELETEZ(pLastItem);
+ {
+ delete pLastItem;
+ pLastItem = nullptr;
+ }
if ( pState && !IsInvalidItem(pState) )
pLastItem = pState->Clone();
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
