diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-12 17:05:52 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-13 08:42:09 +0200 |
commit | 41e2cbc157ce70ea4db67be1a77f61810089b840 (patch) | |
tree | 175c2266fac29042dfd3a158e9aed3a095c837e3 | |
parent | 0673411c58529e6c4252b7973a16afae1f4363f1 (diff) |
loplugin:useuniqueptr in SwUndoDelete
Change-Id: I942e55ffebf265a3138c25bedbb7ef882e6c0916
Reviewed-on: https://gerrit.libreoffice.org/57367
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | sw/source/core/inc/UndoDelete.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/undo/undel.cxx | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx index 81cc23e196bb..7a155fb20322 100644 --- a/sw/source/core/inc/UndoDelete.hxx +++ b/sw/source/core/inc/UndoDelete.hxx @@ -38,9 +38,9 @@ class SwUndoDelete , private SwUndRng , private SwUndoSaveContent { - SwNodeIndex* m_pMvStt; // Position of Nodes in UndoNodes-Array + std::unique_ptr<SwNodeIndex> m_pMvStt; // Position of Nodes in UndoNodes-Array boost::optional<OUString> m_aSttStr, m_aEndStr; - SwRedlineSaveDatas* m_pRedlSaveData; + std::unique_ptr<SwRedlineSaveDatas> m_pRedlSaveData; std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart; std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd; diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index e4f3ea72f6b0..c76ee1c90ac7 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -122,11 +122,10 @@ SwUndoDelete::SwUndoDelete( if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) { - m_pRedlSaveData = new SwRedlineSaveDatas; + m_pRedlSaveData.reset(new SwRedlineSaveDatas); if( !FillSaveData( rPam, *m_pRedlSaveData )) { - delete m_pRedlSaveData; - m_pRedlSaveData = nullptr; + m_pRedlSaveData.reset(); } } @@ -302,7 +301,7 @@ SwUndoDelete::SwUndoDelete( // Step 3: Moving into UndoArray... m_nNode = rNds.GetEndOfContent().GetIndex(); rDocNds.MoveNodes( aRg, rNds, SwNodeIndex( rNds.GetEndOfContent() )); - m_pMvStt = new SwNodeIndex( rNds, m_nNode ); + m_pMvStt.reset( new SwNodeIndex( rNds, m_nNode ) ); // remember difference! m_nNode = rNds.GetEndOfContent().GetIndex() - m_nNode; @@ -518,9 +517,9 @@ SwUndoDelete::~SwUndoDelete() { // Insert saves content in IconSection m_pMvStt->GetNode().GetNodes().Delete( *m_pMvStt, m_nNode ); - delete m_pMvStt; + m_pMvStt.reset(); } - delete m_pRedlSaveData; + m_pRedlSaveData.reset(); } static SwRewriter lcl_RewriterFromHistory(SwHistory & rHistory) @@ -974,8 +973,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext) "SwUndoDelete::Redo: used to have redline data, but now none?"); if (!bSuccess) { - delete m_pRedlSaveData; - m_pRedlSaveData = nullptr; + m_pRedlSaveData.reset(); } } |