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 /writerperfect | |
| 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 'writerperfect')
| -rw-r--r-- | writerperfect/qa/unit/DirectoryStreamTest.cxx | 2 | ||||
| -rw-r--r-- | writerperfect/source/common/DirectoryStream.cxx | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/writerperfect/qa/unit/DirectoryStreamTest.cxx b/writerperfect/qa/unit/DirectoryStreamTest.cxx index 7c48e49b48e4..8d8388dc3c0d 100644 --- a/writerperfect/qa/unit/DirectoryStreamTest.cxx +++ b/writerperfect/qa/unit/DirectoryStreamTest.cxx @@ -13,8 +13,6 @@ #include <comphelper/processfactory.hxx> -#include <o3tl/make_unique.hxx> - #include <ucbhelper/content.hxx> #include <test/bootstrapfixture.hxx> diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx index 7f3e1b165da6..d6d39143ecdd 100644 --- a/writerperfect/source/common/DirectoryStream.cxx +++ b/writerperfect/source/common/DirectoryStream.cxx @@ -33,8 +33,6 @@ #include <comphelper/processfactory.hxx> -#include <o3tl/make_unique.hxx> - #include <rtl/ustring.hxx> #include <ucbhelper/content.hxx> @@ -145,7 +143,7 @@ DirectoryStream::createForParent(const css::uno::Reference<css::ucb::XContent>& const uno::Reference<ucb::XContent> xDirContent(xChild->getParent(), uno::UNO_QUERY); if (xDirContent.is()) { - pDir = o3tl::make_unique<DirectoryStream>(xDirContent); + pDir = std::make_unique<DirectoryStream>(xDirContent); if (!pDir->isStructured()) pDir.reset(); } |