From 30bb90fc2a9726068db49ddb8c1e818777d5c5b1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 2 May 2018 14:23:11 +0200 Subject: loplugin:useuniqueptr in PathSettings Change-Id: Ib0e6e293e10473b7ada3919f781cfd05ef78749c Reviewed-on: https://gerrit.libreoffice.org/53761 Tested-by: Jenkins Reviewed-by: Noel Grandin --- framework/source/services/pathsettings.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'framework/source') diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 82feb855a636..f24d4976c604 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -170,7 +170,7 @@ private: /** helper to listen for configuration changes without ownership cycle problems */ css::uno::Reference< css::util::XChangesListener > m_xCfgNewListener; - ::cppu::OPropertyArrayHelper* m_pPropHelp; + std::unique_ptr<::cppu::OPropertyArrayHelper> m_pPropHelp; public: @@ -468,8 +468,7 @@ void SAL_CALL PathSettings::disposing() m_xCfgNew.clear(); m_xCfgNewListener.clear(); - delete m_pPropHelp; - m_pPropHelp = nullptr; + m_pPropHelp.reset(); } css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rType ) @@ -1099,8 +1098,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() ++i; } - delete m_pPropHelp; - m_pPropHelp = new ::cppu::OPropertyArrayHelper(m_lPropDesc, false); // false => not sorted ... must be done inside helper + m_pPropHelp.reset(new ::cppu::OPropertyArrayHelper(m_lPropDesc, false)); // false => not sorted ... must be done inside helper // <- SAFE } -- cgit v1.2.3