use unique_ptr in SfxEventConfiguration::ConvertToMacro

Change-Id: I7f96ce55b22212c38972a51c9273c9f9cd241acf
Reviewed-on: https://gerrit.libreoffice.org/66183
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

include/sfx2/evntconf.hxx

@@ -98,7 +98,7 @@ class SFX2_DLLPUBLIC SfxEventConfiguration
 {
 public:
     static void                         ConfigureEvent( const OUString& aName, const SvxMacro&, SfxObjectShell const * pObjSh);
-    static SvxMacro*                    ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc );
+    static std::unique_ptr<SvxMacro>    ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc );
 };
 
 #endif

sfx2/source/config/evntconf.cxx

@@ -238,7 +238,7 @@ void SfxEventConfiguration::ConfigureEvent( const OUString& aName, const SvxMacr
 }
 
 
-SvxMacro* SfxEventConfiguration::ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc )
+std::unique_ptr<SvxMacro> SfxEventConfiguration::ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc )
 {
     return SfxEvents_Impl::ConvertToMacro( rElement, pDoc );
 }

sfx2/source/inc/eventsupplier.hxx

@@ -79,7 +79,7 @@ public:
     virtual void SAL_CALL       disposing( const css::lang::EventObject& Source ) override;
 
     // convert and normalize
-    static SvxMacro*            ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc );
+    static std::unique_ptr<SvxMacro>  ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc );
     static void                 NormalizeMacro( const css::uno::Any& rIn, css::uno::Any& rOut, SfxObjectShell* pDoc );
     static void                 NormalizeMacro(
                                     const ::comphelper::NamedValueCollection& i_eventDescriptor,

sfx2/source/notify/eventsupplier.cxx

@@ -329,9 +329,9 @@ SfxEvents_Impl::~SfxEvents_Impl()
 }
 
 
-SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShell* pObjShell )
+std::unique_ptr<SvxMacro> SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShell* pObjShell )
 {
-    SvxMacro* pMacro = nullptr;
+    std::unique_ptr<SvxMacro> pMacro;
     uno::Sequence < beans::PropertyValue > aProperties;
     uno::Any aAny;
     NormalizeMacro( rElement, aAny, pObjShell );
@@ -383,10 +383,10 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShe
                 aLibrary = SfxGetpApp()->GetName();
             else
                 aLibrary.clear();
-            pMacro = new SvxMacro( aMacroName, aLibrary, eType );
+            pMacro.reset(new SvxMacro( aMacroName, aLibrary, eType ));
         }
         else if ( eType == EXTENDED_STYPE )
-            pMacro = new SvxMacro( aScriptURL, aType );
+            pMacro.reset(new SvxMacro( aScriptURL, aType ));
     }
 
     return pMacro;

sw/source/filter/html/htmlbas.cxx

@@ -317,11 +317,10 @@ void SwHTMLWriter::OutBasicBodyEvents()
     uno::Reference < container::XNameReplace > xEvents = xSup->getEvents();
     for ( sal_Int32 i=0; i<4; i++ )
     {
-        SvxMacro* pMacro = SfxEventConfiguration::ConvertToMacro( xEvents->getByName( OUString::createFromAscii(aEventNames[i]) ), pDocSh );
+        std::unique_ptr<SvxMacro> pMacro = SfxEventConfiguration::ConvertToMacro( xEvents->getByName( OUString::createFromAscii(aEventNames[i]) ), pDocSh );
         if ( pMacro )
         {
             aDocTable.Insert( aBodyEventTable[i].nEvent, *pMacro );
-            delete pMacro;
         }
     }