diff options
| -rw-r--r-- | editeng/source/items/numitem.cxx | 6 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/StartMarker.cxx | 6 | ||||
| -rw-r--r-- | sot/source/sdstor/storage.cxx | 8 | ||||
| -rw-r--r-- | svl/source/items/itempool.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/brwbox/ebbcontrols.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/config/accessibilityoptions.cxx | 3 |
6 files changed, 21 insertions, 10 deletions
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 91a6cee1f7a2..bc10590f460f 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -726,8 +726,10 @@ SvxNumRule::~SvxNumRule() { if(!--nRefCount) { - DELETEZ(pStdNumFmt); - DELETEZ(pStdOutlineNumFmt); + delete pStdNumFmt; + pStdNumFmt = nullptr; + delete pStdOutlineNumFmt; + pStdOutlineNumFmt = nullptr; } } diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 2d9eda114000..09a118f41a97 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -85,8 +85,10 @@ void OStartMarker::dispose() { 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_aVRuler.disposeAndClear(); m_aText.disposeAndClear(); 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 diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 82668c909a35..6deec84947c0 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -542,7 +542,8 @@ void SfxItemPool::SetPoolDefaultItem(const SfxPoolItem &rItem) if (rOldDefault) { rOldDefault->SetRefCount(0); - DELETEZ(rOldDefault); + delete rOldDefault; + rOldDefault = nullptr; } rOldDefault = pNewDefault; } @@ -567,7 +568,8 @@ void SfxItemPool::ResetPoolDefaultItem( sal_uInt16 nWhichId ) if (rOldDefault) { rOldDefault->SetRefCount(0); - DELETEZ(rOldDefault); + delete rOldDefault; + rOldDefault = nullptr; } } else if ( pImpl->mpSecondary ) diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index b15927af9e58..1ac4605a3096 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -525,7 +525,7 @@ namespace svt EditCellController::~EditCellController( ) { if ( m_bOwnImplementation ) - DELETEZ( m_pEditImplementation ); + delete m_pEditImplementation; } void EditCellController::SaveValue() diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 43fa4287f9e0..2790296c424d 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -379,7 +379,8 @@ SvtAccessibilityOptions::~SvtAccessibilityOptions() { //if( sm_pSingleImplConfig->IsModified() ) // sm_pSingleImplConfig->Commit(); - DELETEZ( sm_pSingleImplConfig ); + delete sm_pSingleImplConfig; + sm_pSingleImplConfig = nullptr; } } |