Kaydet (Commit) 31f841db authored tarafından Michael Stahl's avatar Michael Stahl

sw: replace delete with unique_ptr in SwListImpl

Change-Id: I5ee0928bb5ce490b52005eb3f97b56ceb81db062
üst f34480a5
...@@ -57,7 +57,7 @@ class SwListImpl ...@@ -57,7 +57,7 @@ class SwListImpl
OUString msDefaultListStyleName; OUString msDefaultListStyleName;
// list trees for certain document ranges // list trees for certain document ranges
typedef std::pair<SwNodeNum*, SwPaM*> tListTreeForRange; typedef std::pair<std::unique_ptr<SwNodeNum>, std::unique_ptr<SwPaM>> tListTreeForRange;
typedef std::vector<tListTreeForRange> tListTrees; typedef std::vector<tListTreeForRange> tListTrees;
tListTrees maListTrees; tListTrees maListTrees;
...@@ -82,8 +82,7 @@ SwListImpl::SwListImpl( const OUString& sListId, ...@@ -82,8 +82,7 @@ SwListImpl::SwListImpl( const OUString& sListId,
SwNodeNum* pNumberTreeRootNode = new SwNodeNum( &rDefaultListStyle ); SwNodeNum* pNumberTreeRootNode = new SwNodeNum( &rDefaultListStyle );
SwPaM* pPam = new SwPaM( *(aPam.Start()), *(aPam.End()) ); SwPaM* pPam = new SwPaM( *(aPam.Start()), *(aPam.End()) );
tListTreeForRange aListTreeForRange( pNumberTreeRootNode, pPam ); maListTrees.emplace_back(pNumberTreeRootNode, pPam);
maListTrees.push_back( aListTreeForRange );
pNode = pNode->EndOfSectionNode(); pNode = pNode->EndOfSectionNode();
if (pNode != &rNodes.GetEndOfContent()) if (pNode != &rNodes.GetEndOfContent())
...@@ -104,8 +103,6 @@ SwListImpl::~SwListImpl() COVERITY_NOEXCEPT_FALSE ...@@ -104,8 +103,6 @@ SwListImpl::~SwListImpl() COVERITY_NOEXCEPT_FALSE
++aNumberTreeIter ) ++aNumberTreeIter )
{ {
SwNodeNum::HandleNumberTreeRootNodeDelete( *((*aNumberTreeIter).first) ); SwNodeNum::HandleNumberTreeRootNodeDelete( *((*aNumberTreeIter).first) );
delete (*aNumberTreeIter).first;
delete (*aNumberTreeIter).second;
} }
} }
......
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