diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-21 21:26:50 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-22 08:38:28 +0100 |
| commit | 0c64df243259f574daaa4bc03bc4ddcc791c9073 (patch) | |
| tree | 657a489d604ae2f7938369ef1789e746df0a3e69 /oox | |
| parent | fd8a724d22c92e3ebef4a3da126baaac3d3bde79 (diff) | |
o3tl::make_unique -> std::make_unique in i18npool...reportdesign
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I8bee1344f7df82536f31bc5e4ec4fd379cac1d04
Reviewed-on: https://gerrit.libreoffice.org/66704
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/crypto/CryptTools.cxx | 4 | ||||
| -rw-r--r-- | oox/source/drawingml/effectproperties.cxx | 3 | ||||
| -rw-r--r-- | oox/source/drawingml/effectpropertiescontext.cxx | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx index ffe548d5912e..96290e0dc5fc 100644 --- a/oox/source/crypto/CryptTools.cxx +++ b/oox/source/crypto/CryptTools.cxx @@ -12,8 +12,6 @@ #include <filter/msfilter/mscodec.hxx> #include <com/sun/star/uno/RuntimeException.hpp> -#include <o3tl/make_unique.hxx> - #if USE_TLS_OPENSSL #include <openssl/evp.h> #include <openssl/sha.h> @@ -316,7 +314,7 @@ struct CryptoImpl #endif Crypto::Crypto() - : mpImpl(o3tl::make_unique<CryptoImpl>()) + : mpImpl(std::make_unique<CryptoImpl>()) { } diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx index ff9ded567784..bbfee474b3f2 100644 --- a/oox/source/drawingml/effectproperties.cxx +++ b/oox/source/drawingml/effectproperties.cxx @@ -15,7 +15,6 @@ #include <oox/token/tokens.hxx> #include <basegfx/numeric/ftools.hxx> -#include <o3tl/make_unique.hxx> namespace oox { namespace drawingml { @@ -36,7 +35,7 @@ void EffectProperties::assignUsed( const EffectProperties& rSourceProps ) m_Effects.reserve(rSourceProps.m_Effects.size()); for (auto const& it : rSourceProps.m_Effects) { - m_Effects.push_back(o3tl::make_unique<Effect>(*it)); + m_Effects.push_back(std::make_unique<Effect>(*it)); } } } diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx index 0316abbf752d..4c779e75f1ef 100644 --- a/oox/source/drawingml/effectpropertiescontext.cxx +++ b/oox/source/drawingml/effectpropertiescontext.cxx @@ -15,8 +15,6 @@ #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> -#include <o3tl/make_unique.hxx> - using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -75,7 +73,7 @@ void EffectPropertiesContext::saveUnsupportedAttribs( Effect& rEffect, const Att ContextHandlerRef EffectPropertiesContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { sal_Int32 nPos = mrEffectProperties.m_Effects.size(); - mrEffectProperties.m_Effects.push_back(o3tl::make_unique<Effect>()); + mrEffectProperties.m_Effects.push_back(std::make_unique<Effect>()); switch( nElement ) { case A_TOKEN( outerShdw ): |