From 000fa4c4952cdc3d63f91a63eb4b3da83e5990ca Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Jan 2018 14:51:22 +0200 Subject: loplugin:useuniqueptr in SbiStdObject Change-Id: Ic66d817746de423549c87f58068e47f9942d04fd --- basic/source/inc/stdobj.hxx | 2 +- basic/source/runtime/stdobj.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx index 12eb8dc31234..d7bc4c176493 100644 --- a/basic/source/inc/stdobj.hxx +++ b/basic/source/inc/stdobj.hxx @@ -27,7 +27,7 @@ class SbStdFactory; class SbiStdObject : public SbxObject { - SbStdFactory* pStdFactory; + std::unique_ptr pStdFactory; virtual ~SbiStdObject() override; using SbxVariable::GetInfo; diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index 23c00519214b..d6349e0000a0 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -724,16 +724,16 @@ SbiStdObject::SbiStdObject( const OUString& r, StarBASIC* pb ) : SbxObject( r ) SetParent( pb ); - pStdFactory = new SbStdFactory; - SbxBase::AddFactory( pStdFactory ); + pStdFactory.reset( new SbStdFactory ); + SbxBase::AddFactory( pStdFactory.get() ); Insert( new SbStdClipboard ); } SbiStdObject::~SbiStdObject() { - SbxBase::RemoveFactory( pStdFactory ); - delete pStdFactory; + SbxBase::RemoveFactory( pStdFactory.get() ); + pStdFactory.reset(); } // Finding an element: -- cgit