diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-11 11:37:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-12 07:11:05 +0100 |
| commit | c8fe80fa0029798f847c8443aae54639ad193b08 (patch) | |
| tree | 94ba113268f95dc5e2f3c6ceb18e71fa8ca27006 /sfx2 | |
| parent | 70d509c9865664dffb49c2b6cafe5627d1fd26c7 (diff) | |
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>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/config/evntconf.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/inc/eventsupplier.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/notify/eventsupplier.cxx | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 211b6fd1a774..a6710302e09a 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/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 ); } diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 9c3ff357b7f2..be6421416939 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/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, diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 261ce2db54aa..ea23654f59b3 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/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; |