diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/fsys/fileutil.cxx | 9 | ||||
| -rw-r--r-- | tools/source/xml/XmlWalker.cxx | 3 | ||||
| -rw-r--r-- | tools/source/xml/XmlWriter.cxx | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/tools/source/fsys/fileutil.cxx b/tools/source/fsys/fileutil.cxx index a24f82316813..e9efcb994e71 100644 --- a/tools/source/fsys/fileutil.cxx +++ b/tools/source/fsys/fileutil.cxx @@ -13,7 +13,6 @@ #include <osl/file.hxx> #include <string.h> #include <o3tl/char16_t2wchar_t.hxx> -#include <o3tl/make_unique.hxx> #define WIN32_LEAN_AND_MEAN #include <Windows.h> #endif @@ -30,12 +29,12 @@ bool IsMappedWebDAVPath(const INetURLObject& aURL) if (osl::FileBase::getSystemPathFromFileURL(sURL, aSystemPath) == osl::FileBase::E_None) { DWORD nSize = MAX_PATH; - auto bufUNC(o3tl::make_unique<char[]>(nSize)); + auto bufUNC(std::make_unique<char[]>(nSize)); DWORD nResult = WNetGetUniversalNameW(o3tl::toW(aSystemPath.getStr()), UNIVERSAL_NAME_INFO_LEVEL, bufUNC.get(), &nSize); if (nResult == ERROR_MORE_DATA) { - bufUNC = o3tl::make_unique<char[]>(nSize); + bufUNC = std::make_unique<char[]>(nSize); nResult = WNetGetUniversalNameW(o3tl::toW(aSystemPath.getStr()), UNIVERSAL_NAME_INFO_LEVEL, bufUNC.get(), &nSize); } @@ -50,12 +49,12 @@ bool IsMappedWebDAVPath(const INetURLObject& aURL) aReq.lpRemoteName = pInfo->lpUniversalName; } nSize = 1024; - auto bufInfo(o3tl::make_unique<char[]>(nSize)); + auto bufInfo(std::make_unique<char[]>(nSize)); LPWSTR pSystem = nullptr; nResult = WNetGetResourceInformationW(&aReq, bufInfo.get(), &nSize, &pSystem); if (nResult == ERROR_MORE_DATA) { - bufInfo = o3tl::make_unique<char[]>(nSize); + bufInfo = std::make_unique<char[]>(nSize); nResult = WNetGetResourceInformationW(&aReq, bufInfo.get(), &nSize, &pSystem); } if (nResult == NO_ERROR) diff --git a/tools/source/xml/XmlWalker.cxx b/tools/source/xml/XmlWalker.cxx index 7e6d282918d4..ca5c2c96eb2b 100644 --- a/tools/source/xml/XmlWalker.cxx +++ b/tools/source/xml/XmlWalker.cxx @@ -9,7 +9,6 @@ #include <tools/stream.hxx> #include <tools/XmlWalker.hxx> -#include <o3tl/make_unique.hxx> #include <libxml/tree.h> #include <libxml/parser.h> @@ -35,7 +34,7 @@ struct XmlWalkerImpl }; XmlWalker::XmlWalker() - : mpImpl(o3tl::make_unique<XmlWalkerImpl>()) + : mpImpl(std::make_unique<XmlWalkerImpl>()) { } diff --git a/tools/source/xml/XmlWriter.cxx b/tools/source/xml/XmlWriter.cxx index f7b288d835f9..7780bbb35fb5 100644 --- a/tools/source/xml/XmlWriter.cxx +++ b/tools/source/xml/XmlWriter.cxx @@ -9,7 +9,6 @@ #include <tools/stream.hxx> #include <tools/XmlWriter.hxx> -#include <o3tl/make_unique.hxx> #include <libxml/xmlwriter.h> @@ -45,7 +44,7 @@ struct XmlWriterImpl }; XmlWriter::XmlWriter(SvStream* pStream) - : mpImpl(o3tl::make_unique<XmlWriterImpl>(pStream)) + : mpImpl(std::make_unique<XmlWriterImpl>(pStream)) { } |