diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-02-04 20:41:49 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-08 12:30:06 +0100 |
| commit | 43635b474cdce65e64fa9ca9d27a3cee6d96d50b (patch) | |
| tree | 04d4223ebf161e2dc83f0842a1a81cef76d784d6 /ucb | |
| parent | 2d6313a9fac81340883b24fe3651781d31c6039d (diff) | |
o3tl::make_unique -> std::make_unique in tools..xmloff
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Ib3201f865d43f372007cdf381c7e244e9cbeae26
Reviewed-on: https://gerrit.libreoffice.org/67474
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/ftp/ftpcontent.cxx | 3 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx | 3 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/webdavcontentcaps.cxx | 3 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/webdavdatasupplier.cxx | 5 |
4 files changed, 5 insertions, 9 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 67767892b816..3d79dca53259 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -41,7 +41,6 @@ #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> @@ -486,7 +485,7 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand, = new DynamicResultSet( m_xContext, aOpenCommand, - o3tl::make_unique<ResultSetFactory>(m_xContext, + std::make_unique<ResultSetFactory>(m_xContext, m_xProvider.get(), aOpenCommand.Properties, resvec)); diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx index e5fe6403650d..66591aa1f749 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx @@ -34,7 +34,6 @@ *************************************************************************/ #include <sal/log.hxx> -#include <o3tl/make_unique.hxx> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <com/sun/star/ucb/OpenMode.hpp> #include <com/sun/star/ucb/ResultSetException.hpp> @@ -467,7 +466,7 @@ bool DataSupplier::getData() } m_pImpl->m_Results.push_back( - o3tl::make_unique<ResultListEntry>(pContentProperties)); + std::make_unique<ResultListEntry>(pContentProperties)); } } catch ( DAVException const & ) diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index 21703fab2da1..20a2c11ff770 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/ucb/Lock.hpp> #include <com/sun/star/ucb/LockEntry.hpp> -#include <o3tl/make_unique.hxx> #include "webdavcontent.hxx" #include "webdavprovider.hxx" #include "DAVSession.hxx" @@ -54,7 +53,7 @@ bool ContentProvider::getProperty( osl::MutexGuard aGuard( m_aMutex ); if ( !m_pProps ) { - m_pProps = o3tl::make_unique<PropertyMap>(); + m_pProps = std::make_unique<PropertyMap>(); // Fill map of known properties... diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index d3e6b936faa7..6225008d544d 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -23,7 +23,6 @@ #include <memory> #include <utility> -#include <o3tl/make_unique.hxx> #include <com/sun/star/ucb/OpenMode.hpp> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/providerhelper.hxx> @@ -104,7 +103,7 @@ DataSupplier::DataSupplier( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, sal_Int32 nOpenMode ) -: m_pImpl(o3tl::make_unique<DataSupplier_Impl>(rxContext, rContent, nOpenMode)) +: m_pImpl(std::make_unique<DataSupplier_Impl>(rxContext, rContent, nOpenMode)) { } @@ -406,7 +405,7 @@ bool DataSupplier::getData() } std::unique_ptr<ContentProperties> pContentProperties - = o3tl::make_unique<ContentProperties>( rRes ); + = std::make_unique<ContentProperties>( rRes ); // Check resource against open mode. switch ( m_pImpl->m_nOpenMode ) |