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

Miklos Vajna vmiklos at collabora.co.uk
Sat Feb 28 12:51:20 PST 2015


 sw/source/filter/ww8/docxsdrexport.cxx        |    2 +-
 sw/source/filter/ww8/docxsdrexport.hxx        |    4 ++--
 sw/source/filter/ww8/docxtablestyleexport.cxx |    2 +-
 sw/source/filter/ww8/docxtablestyleexport.hxx |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e5d775d1bf603fed463e0e080e40f31dde07a3fa
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Feb 28 15:20:57 2015 +0100

    boost::shared_ptr -> std::shared_ptr
    
    Change-Id: I536b2c2fbbee9e9fd5dd10e016d73a771bd8083f

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 7220cf2..d12acd3 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -194,7 +194,7 @@ struct DocxSdrExport::Impl
 };
 
 DocxSdrExport::DocxSdrExport(DocxExport& rExport, sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML)
-    : m_pImpl(new Impl(*this, rExport, pSerializer, pDrawingML))
+    : m_pImpl(std::make_shared<Impl>(*this, rExport, pSerializer, pDrawingML))
 {
 }
 
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx
index b910ee4..0910128 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_DOCXSDREXPORT_HXX
 #define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXSDREXPORT_HXX
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <com/sun/star/xml/dom/XDocument.hpp>
 #include <rtl/strbuf.hxx>
@@ -52,7 +52,7 @@ public:
 class DocxSdrExport
 {
     struct Impl;
-    boost::shared_ptr<Impl> m_pImpl;
+    std::shared_ptr<Impl> m_pImpl;
 public:
     DocxSdrExport(DocxExport& rExport, sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML);
     ~DocxSdrExport();
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 04f3c92..f3113e9 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -682,7 +682,7 @@ void DocxTableStyleExport::SetSerializer(sax_fastparser::FSHelperPtr pSerializer
 }
 
 DocxTableStyleExport::DocxTableStyleExport(SwDoc* pDoc, sax_fastparser::FSHelperPtr pSerializer)
-    : m_pImpl(new Impl)
+    : m_pImpl(std::make_shared<Impl>())
 {
     m_pImpl->m_pDoc = pDoc;
     m_pImpl->m_pSerializer = pSerializer;
diff --git a/sw/source/filter/ww8/docxtablestyleexport.hxx b/sw/source/filter/ww8/docxtablestyleexport.hxx
index c43a9be..201aea6 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.hxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_DOCXTABLESTYLEEXPORT_HXX
 #define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXTABLESTYLEEXPORT_HXX
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
@@ -22,7 +22,7 @@ class SwDoc;
 class DocxTableStyleExport
 {
     struct Impl;
-    boost::shared_ptr<Impl> m_pImpl;
+    std::shared_ptr<Impl> m_pImpl;
 public:
     void TableStyles(sal_Int32 nCountStylesToWrite);
 


More information about the Libreoffice-commits mailing list