[Libreoffice-commits] core.git: include/o3tl sw/source

[Miklos Vajna]

 include/o3tl/make_unique.hxx           |   34 +++++++++++++++++++++++++++++++++
 sw/source/filter/ww8/docxsdrexport.cxx |    2 -
 sw/source/filter/ww8/docxsdrexport.hxx |    3 +-
 3 files changed, 37 insertions(+), 2 deletions(-)

New commits:
commit 821b72886f1e407a492f881a2efb27ead2c22b5c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu May 21 16:37:16 2015 +0100

    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 at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/include/o3tl/make_unique.hxx b/include/o3tl/make_unique.hxx
new file mode 100644
index 0000000..2be03e9
--- /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 13c7bd0..5e1e94a 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 dd98d71..0a32f20 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();