summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-08-20 14:44:09 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-08-22 08:26:53 +0200
commit8b25bf16fb0ec41681ca8569327d68c493ca88dc (patch)
treea444ed9db180e4ab1569484ef4f9a44daee668e9 /ucb
parenta18a72ac1a71360b5d30c713437c8d2bd36321aa (diff)
loplugin:useuniqueptr in DynamicResultSet
Change-Id: I1c34dbe81a6909bfbc4d62f5f9f73e7b9114e58c Reviewed-on: https://gerrit.libreoffice.org/59362 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx3
-rw-r--r--ucb/source/ucp/ftp/ftpdynresultset.cxx4
-rw-r--r--ucb/source/ucp/ftp/ftpdynresultset.hxx2
3 files changed, 5 insertions, 4 deletions
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;
};