diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-21 16:37:16 +0100 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2016-05-22 03:33:30 +0000 |
| commit | cc2a8bd3b69bf187c000c370a7a6c164506281d8 (patch) | |
| tree | e4c9876866ee8ca04b7879f1c1f17e065f8fb35c /sw | |
| parent | 16c3defa8ff6330e4c21ba42177d92665a67ac0b (diff) | |
o3tl: add make_unique template till we can't use std::make_unique
Change-Id: I48b26f0199e339badf7a0e2bed322ca701689d13
Reviewed-on: https://gerrit.libreoffice.org/15846
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 821b72886f1e407a492f881a2efb27ead2c22b5c)
Reviewed-on: https://gerrit.libreoffice.org/25281
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxsdrexport.hxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index ff9d5d5dae00..6ddd224b1c48 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -184,7 +184,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(); |