summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-01-21 23:47:35 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-01-28 09:52:28 +0100
commit4e8a15ca224760e8f36952528b2b47def78fd865 (patch)
tree963bbbe22d03a82fa3a82bc3fa74d4ebf848a1fe /shell
parent5238ff887849b0d94c6da00a07b57984a86b6ee6 (diff)
o3tl::make_unique -> std::make_unique in sax...svtools (except sc)
Since it is now possible to use C++14, it's time to replace the temporary solution with the standard one Change-Id: I6eea0877eaa1886b64c0cce06a43b8088cbccd8e Reviewed-on: https://gerrit.libreoffice.org/66751 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/source/win32/simplemail/smplmailclient.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index db138566f90c..1466d3f86228 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -28,7 +28,6 @@
#include <com/sun/star/system/XSimpleMailMessage2.hpp>
#include <osl/file.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
-#include <o3tl/make_unique.hxx>
#include <tools/urlobj.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/syslocale.hxx>
@@ -204,7 +203,7 @@ OUString CSmplMailClient::CopyAttachment(const OUString& sOrigAttachURL, OUStrin
// removed in Desktop::RemoveTemporaryDirectory() if soffice process gets closed before the
// mailer finishes using them.
- maAttachmentFiles.emplace_back(o3tl::make_unique<utl::TempFile>(&GetBaseTempDirURL()));
+ maAttachmentFiles.emplace_back(std::make_unique<utl::TempFile>(&GetBaseTempDirURL()));
maAttachmentFiles.back()->EnableKillingFile();
INetURLObject aFilePathObj(maAttachmentFiles.back()->GetURL());
OUString sNewAttachmentURL = aFilePathObj.GetMainURL(INetURLObject::DecodeMechanism::NONE);