sc/source/core/tool/callform.cxx | 4 ++-- ucb/source/ucp/ftp/ftpcontent.cxx | 3 ++- ucb/source/ucp/ftp/ftpdynresultset.cxx | 4 ++-- ucb/source/ucp/ftp/ftpdynresultset.hxx | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit 66a8ad83d5b8142720c8579bdde046e9332c06ca Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Aug 20 14:46:12 2018 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Wed Aug 22 08:27:07 2018 +0200 loplugin:useuniqueptr in ModuleData Change-Id: I90b4f18028fe269f44973fbb3b8ed002335f11ef Reviewed-on: https://gerrit.libreoffice.org/59363 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx index 1acfa271e5e3..21eb192526a7 100644 --- a/sc/source/core/tool/callform.cxx +++ b/sc/source/core/tool/callform.cxx @@ -85,7 +85,7 @@ public: ModuleData(const ModuleData&) = delete; const ModuleData& operator=(const ModuleData&) = delete; - ModuleData(const OUString& rStr, osl::Module* pInst) : aName(rStr), pInstance(pInst) {} + ModuleData(const OUString& rStr, std::unique_ptr<osl::Module> pInst) : aName(rStr), pInstance(std::move(pInst)) {} const OUString& GetName() const { return aName; } osl::Module* GetInstance() const { return pInstance.get(); } @@ -193,7 +193,7 @@ bool InitExternalFunc(const OUString& rModuleName) } // include module into the collection - ModuleData* pModuleData = new ModuleData(rModuleName, pLib.release()); + ModuleData* pModuleData = new ModuleData(rModuleName, std::move(pLib)); aModuleCollection.insert(pModuleData); // initialize interface commit 8b25bf16fb0ec41681ca8569327d68c493ca88dc Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Aug 20 14:44:09 2018 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Wed Aug 22 08:26:53 2018 +0200 loplugin:useuniqueptr in DynamicResultSet Change-Id: I1c34dbe81a6909bfbc4d62f5f9f73e7b9114e58c Reviewed-on: https://gerrit.libreoffice.org/59362 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 9fecafdcc83c..a07e626edb07 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -41,6 +41,7 @@ #include "curl.hxx" #include <curl/easy.h> #include <comphelper/propertysequence.hxx> +#include <o3tl/make_unique.hxx> #include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/fd_inputstream.hxx> @@ -499,7 +500,7 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand, = new DynamicResultSet( m_xContext, aOpenCommand, - new ResultSetFactory(m_xContext, + o3tl::make_unique<ResultSetFactory>(m_xContext, m_xProvider.get(), aOpenCommand.Properties, resvec)); diff --git a/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx index e4ca744525f8..8021f9dd48ad 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.cxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx @@ -36,9 +36,9 @@ using namespace ftp; DynamicResultSet::DynamicResultSet( const Reference< XComponentContext >& rxContext, const OpenCommandArgument2& rCommand, - ResultSetFactory* pFactory ) + std::unique_ptr<ResultSetFactory> pFactory ) : ResultSetImplHelper( rxContext, rCommand ), - m_pFactory( pFactory ) + m_pFactory( std::move(pFactory) ) { } diff --git a/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx index 7966345baeca..ff57e90bd98f 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.hxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx @@ -42,7 +42,7 @@ namespace ftp { DynamicResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::ucb::OpenCommandArgument2& rCommand, - ResultSetFactory* pFactory ); + std::unique_ptr<ResultSetFactory> pFactory ); virtual ~DynamicResultSet() override; }; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits