Kaydet (Commit) 4a64a68c authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in TreeControlPeer

Change-Id: I40bf5d147b4617ab225d190643b70d29ae34b7ec
üst f063d364
...@@ -150,7 +150,6 @@ TreeControlPeer::~TreeControlPeer() ...@@ -150,7 +150,6 @@ TreeControlPeer::~TreeControlPeer()
{ {
if( mpTreeImpl ) if( mpTreeImpl )
mpTreeImpl->Clear(); mpTreeImpl->Clear();
delete mpTreeNodeMap;
} }
...@@ -160,7 +159,7 @@ void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry ) ...@@ -160,7 +159,7 @@ void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry )
{ {
if( !mpTreeNodeMap ) if( !mpTreeNodeMap )
{ {
mpTreeNodeMap = new TreeNodeMap; mpTreeNodeMap.reset( new TreeNodeMap );
} }
(*mpTreeNodeMap)[ pEntry->mxNode ] = pEntry; (*mpTreeNodeMap)[ pEntry->mxNode ] = pEntry;
...@@ -207,8 +206,7 @@ vcl::Window* TreeControlPeer::createVclControl( vcl::Window* pParent, sal_Int64 ...@@ -207,8 +206,7 @@ vcl::Window* TreeControlPeer::createVclControl( vcl::Window* pParent, sal_Int64
/** called from the UnoTreeListBoxImpl when it gets deleted */ /** called from the UnoTreeListBoxImpl when it gets deleted */
void TreeControlPeer::disposeControl() void TreeControlPeer::disposeControl()
{ {
delete mpTreeNodeMap; mpTreeNodeMap.reset();
mpTreeNodeMap = nullptr;
mpTreeImpl = nullptr; mpTreeImpl = nullptr;
} }
......
...@@ -165,7 +165,7 @@ private: ...@@ -165,7 +165,7 @@ private:
OUString msDefaultExpandedGraphicURL; OUString msDefaultExpandedGraphicURL;
Image maDefaultExpandedImage; Image maDefaultExpandedImage;
Image maDefaultCollapsedImage; Image maDefaultCollapsedImage;
TreeNodeMap* mpTreeNodeMap; std::unique_ptr<TreeNodeMap> mpTreeNodeMap;
css::uno::Reference< css::graphic::XGraphicProvider > mxGraphicProvider; css::uno::Reference< css::graphic::XGraphicProvider > mxGraphicProvider;
}; };
......
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