summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-08-12 11:15:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-08-12 22:04:55 +0200
commitd4df251320ba266ff3fe3da9e3b991c18ea50f5c (patch)
tree99d099231c1e44d714ec485baea7be6456817070 /sot
parent2cb40c77cd05c1cb5a85468ff9801051829871e4 (diff)
expand out DELETEZ
Change-Id: Ia69fb105c6cc661ac94a360d47655b3faa9d6bb8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100618 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sot')
-rw-r--r--sot/source/sdstor/storage.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index f15fb22dd9f1..56ffb92dc108 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -306,7 +306,10 @@ void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode )
// check the stream
m_pStorStm = ::utl::UcbStreamHelper::CreateStream( m_aName, nMode ).release();
if ( m_pStorStm && m_pStorStm->GetError() )
- DELETEZ( m_pStorStm );
+ {
+ delete m_pStorStm;
+ m_pStorStm = nullptr;
+ }
if ( m_pStorStm )
{
@@ -319,7 +322,8 @@ void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode )
if ( bIsUCBStorage )
{
// UCBStorage always works directly on the UCB content, so discard the stream first
- DELETEZ( m_pStorStm );
+ delete m_pStorStm;
+ m_pStorStm = nullptr;
m_pOwnStg = new UCBStorage( m_aName, nMode, true, true/*bIsRoot*/ );
}
else