diff options
-rw-r--r-- | include/o3tl/make_unique.hxx | 34 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxsdrexport.hxx | 3 |
3 files changed, 37 insertions, 2 deletions
diff --git a/include/o3tl/make_unique.hxx b/include/o3tl/make_unique.hxx new file mode 100644 index 000000000000..2be03e9dc9cf --- /dev/null +++ b/include/o3tl/make_unique.hxx @@ -0,0 +1,34 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_O3TL_MAKE_UNIQUE_HXX +#define INCLUDED_O3TL_MAKE_UNIQUE_HXX + +#include <memory> +#include <utility> + +namespace o3tl +{ + +/** + * Constructs an object of type T and wraps it in a std::unique_ptr. + * + * Can be replaced by std::make_unique when we allow C++14. + */ +template<typename T, typename... Args> +typename std::unique_ptr<T> make_unique(Args&& ... args) +{ + return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); +} + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 13c7bd0ab1e4..5e1e94a7b3ef 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -188,7 +188,7 @@ struct DocxSdrExport::Impl }; DocxSdrExport::DocxSdrExport(DocxExport& rExport, sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML) - : m_pImpl(std::make_shared<Impl>(*this, rExport, pSerializer, pDrawingML)) + : m_pImpl(o3tl::make_unique<Impl>(*this, rExport, pSerializer, pDrawingML)) { } diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx index dd98d716afb1..0a32f20fb555 100644 --- a/sw/source/filter/ww8/docxsdrexport.hxx +++ b/sw/source/filter/ww8/docxsdrexport.hxx @@ -11,6 +11,7 @@ #define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXSDREXPORT_HXX #include <memory> +#include <o3tl/make_unique.hxx> #include <com/sun/star/xml/dom/XDocument.hpp> #include <rtl/strbuf.hxx> @@ -52,7 +53,7 @@ public: class DocxSdrExport { struct Impl; - std::shared_ptr<Impl> m_pImpl; + std::unique_ptr<Impl> m_pImpl; public: DocxSdrExport(DocxExport& rExport, sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML); ~DocxSdrExport(); |