diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-16 14:48:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-19 08:58:46 +0200 |
| commit | 59548784486cfa42662490432474431f760dacc1 (patch) | |
| tree | bfc33ae1d67c6f66864bac97ca4c90b7ef9f0fa7 /basic/source/classes | |
| parent | 263d7325691f4b0a1bda155f1c53bbcf712e9f09 (diff) | |
loplugin:useuniqueptr in SbiGlobals
Change-Id: I0ebec3193b4369039f90be4223ebdf6d048b8478
Diffstat (limited to 'basic/source/classes')
| -rw-r--r-- | basic/source/classes/sb.cxx | 16 | ||||
| -rw-r--r-- | basic/source/classes/sbintern.cxx | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 6562a3fc9d69..524b392a6e98 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -915,8 +915,8 @@ StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic ) if( !GetSbData()->nInst++ ) { - GetSbData()->pSbFac = new SbiFactory; - AddFactory( GetSbData()->pSbFac ); + GetSbData()->pSbFac.reset( new SbiFactory ); + AddFactory( GetSbData()->pSbFac.get() ); GetSbData()->pTypeFac = new SbTypeFactory; AddFactory( GetSbData()->pTypeFac ); GetSbData()->pClassFac = new SbClassFactory; @@ -925,8 +925,8 @@ StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic ) AddFactory( GetSbData()->pOLEFac ); GetSbData()->pFormFac = new SbFormFactory; AddFactory( GetSbData()->pFormFac ); - GetSbData()->pUnoFac = new SbUnoFactory; - AddFactory( GetSbData()->pUnoFac ); + GetSbData()->pUnoFac.reset( new SbUnoFactory ); + AddFactory( GetSbData()->pUnoFac.get() ); } pRtl = new SbiStdObject(RTLNAME, this ); // Search via StarBasic is always global @@ -954,10 +954,10 @@ StarBASIC::~StarBASIC() if( !--GetSbData()->nInst ) { - RemoveFactory( GetSbData()->pSbFac ); - delete GetSbData()->pSbFac; GetSbData()->pSbFac = nullptr; - RemoveFactory( GetSbData()->pUnoFac ); - delete GetSbData()->pUnoFac; GetSbData()->pUnoFac = nullptr; + RemoveFactory( GetSbData()->pSbFac.get() ); + GetSbData()->pSbFac.reset(); + RemoveFactory( GetSbData()->pUnoFac.get() ); + GetSbData()->pUnoFac.reset(); RemoveFactory( GetSbData()->pTypeFac ); delete GetSbData()->pTypeFac; GetSbData()->pTypeFac = nullptr; RemoveFactory( GetSbData()->pClassFac ); diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx index dc5d7b697fbe..1c4af0f5fa9b 100644 --- a/basic/source/classes/sbintern.cxx +++ b/basic/source/classes/sbintern.cxx @@ -60,9 +60,9 @@ SbiGlobals::SbiGlobals() SbiGlobals::~SbiGlobals() { - delete pSbFac; - delete pUnoFac; - delete pTransliterationWrapper; + pSbFac.reset(); + pUnoFac.reset(); + pTransliterationWrapper.reset(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |