Kaydet (Commit) 41e2cbc1 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in SwUndoDelete

Change-Id: I942e55ffebf265a3138c25bedbb7ef882e6c0916
Reviewed-on: https://gerrit.libreoffice.org/57367
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 0673411c
...@@ -38,9 +38,9 @@ class SwUndoDelete ...@@ -38,9 +38,9 @@ class SwUndoDelete
, private SwUndRng , private SwUndRng
, private SwUndoSaveContent , 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; 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_pMetadataUndoStart;
std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd; std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
......
...@@ -122,11 +122,10 @@ SwUndoDelete::SwUndoDelete( ...@@ -122,11 +122,10 @@ SwUndoDelete::SwUndoDelete(
if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
{ {
m_pRedlSaveData = new SwRedlineSaveDatas; m_pRedlSaveData.reset(new SwRedlineSaveDatas);
if( !FillSaveData( rPam, *m_pRedlSaveData )) if( !FillSaveData( rPam, *m_pRedlSaveData ))
{ {
delete m_pRedlSaveData; m_pRedlSaveData.reset();
m_pRedlSaveData = nullptr;
} }
} }
...@@ -302,7 +301,7 @@ SwUndoDelete::SwUndoDelete( ...@@ -302,7 +301,7 @@ SwUndoDelete::SwUndoDelete(
// Step 3: Moving into UndoArray... // Step 3: Moving into UndoArray...
m_nNode = rNds.GetEndOfContent().GetIndex(); m_nNode = rNds.GetEndOfContent().GetIndex();
rDocNds.MoveNodes( aRg, rNds, SwNodeIndex( rNds.GetEndOfContent() )); rDocNds.MoveNodes( aRg, rNds, SwNodeIndex( rNds.GetEndOfContent() ));
m_pMvStt = new SwNodeIndex( rNds, m_nNode ); m_pMvStt.reset( new SwNodeIndex( rNds, m_nNode ) );
// remember difference! // remember difference!
m_nNode = rNds.GetEndOfContent().GetIndex() - m_nNode; m_nNode = rNds.GetEndOfContent().GetIndex() - m_nNode;
...@@ -518,9 +517,9 @@ SwUndoDelete::~SwUndoDelete() ...@@ -518,9 +517,9 @@ SwUndoDelete::~SwUndoDelete()
{ {
// Insert saves content in IconSection // Insert saves content in IconSection
m_pMvStt->GetNode().GetNodes().Delete( *m_pMvStt, m_nNode ); 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) static SwRewriter lcl_RewriterFromHistory(SwHistory & rHistory)
...@@ -974,8 +973,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext) ...@@ -974,8 +973,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext)
"SwUndoDelete::Redo: used to have redline data, but now none?"); "SwUndoDelete::Redo: used to have redline data, but now none?");
if (!bSuccess) if (!bSuccess)
{ {
delete m_pRedlSaveData; m_pRedlSaveData.reset();
m_pRedlSaveData = nullptr;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment