[Libreoffice-commits] core.git: include/oox oox/inc oox/source

[Miklos Vajna]

 include/oox/drawingml/drawingmltypes.hxx    |    3 ++-
 include/oox/drawingml/shape.hxx             |   11 +++++------
 include/oox/ppt/slidepersist.hxx            |    6 +++---
 oox/inc/drawingml/customshapeproperties.hxx |    4 ++--
 oox/source/ppt/pptshapegroupcontext.cxx     |    3 ++-
 5 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit a1d9b5efb5df35d21384d04893429e48e79ff601
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Feb 17 11:33:26 2015 +0100

    oox: use std::enable_shared_from_this
    
    Change-Id: I184a7a3579bebd81d5d81f64b4ace74bde8e87fb

diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index 6c6dee1..2287c66 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_DRAWINGMLTYPES_HXX
 #define INCLUDED_OOX_DRAWINGML_DRAWINGMLTYPES_HXX
 
+#include <memory>
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/style/TabAlign.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
@@ -72,7 +73,7 @@ class TextListStyle;
 typedef boost::shared_ptr< TextListStyle > TextListStylePtr;
 
 class Shape;
-typedef ::boost::shared_ptr< Shape > ShapePtr;
+typedef std::shared_ptr< Shape > ShapePtr;
 
 class Theme;
 typedef ::boost::shared_ptr< Theme > ThemePtr;
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index e3ccce3..052d60c 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -27,8 +27,7 @@
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vector>
 #include <map>
@@ -41,7 +40,7 @@ namespace oox { namespace vml {
 namespace oox { namespace drawingml {
 
 class CustomShapeProperties;
-typedef boost::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr;
+typedef std::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr;
 
 typedef ::std::map< OUString, ShapePtr > ShapeIdMap;
 
@@ -73,7 +72,7 @@ struct LinkedTxbxAttr
 };
 
 class OOX_DLLPUBLIC Shape
-    : public boost::enable_shared_from_this< Shape >
+    : public std::enable_shared_from_this< Shape >
 {
 public:
 
@@ -283,8 +282,8 @@ private:
         FRAMETYPE_TABLE             ///< A table embedded in a shape.
     };
 
-    typedef ::boost::shared_ptr< ::oox::vml::OleObjectInfo >    OleObjectInfoRef;
-    typedef ::boost::shared_ptr< ChartShapeInfo >               ChartShapeInfoRef;
+    typedef std::shared_ptr< ::oox::vml::OleObjectInfo >    OleObjectInfoRef;
+    typedef std::shared_ptr< ChartShapeInfo >               ChartShapeInfoRef;
 
     FrameType           meFrameType;        ///< Type for graphic frame shapes.
     OleObjectInfoRef    mxOleObjectInfo;    ///< Additional data for OLE objects.
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 1a3f473..4bed15e 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
 #define INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <oox/drawingml/shape.hxx>
 #include <oox/drawingml/theme.hxx>
 #include <oox/drawingml/clrscheme.hxx>
@@ -48,9 +48,9 @@ enum ShapeLocation
 class TimeNode;
 class SlidePersist;
 
-typedef boost::shared_ptr< SlidePersist > SlidePersistPtr;
+typedef std::shared_ptr< SlidePersist > SlidePersistPtr;
 
-class SlidePersist : public boost::enable_shared_from_this< SlidePersist >
+class SlidePersist : public std::enable_shared_from_this< SlidePersist >
 {
 
 public:
diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx
index d5fbd88..5826a0d 100644
--- a/oox/inc/drawingml/customshapeproperties.hxx
+++ b/oox/inc/drawingml/customshapeproperties.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
 #define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <unordered_map>
 #include <vector>
 #include <map>
@@ -46,7 +46,7 @@ namespace oox { namespace drawingml {
 
 class CustomShapeProperties;
 
-typedef boost::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr;
+typedef std::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr;
 
 struct CustomShapeGuide
 {
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx
index fb6f780..975906d 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <memory>
 #include <com/sun/star/xml/sax/FastToken.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/container/XNamed.hpp>
@@ -94,7 +95,7 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( sal_Int32 aElementToken
         return new PPTShapeGroupContext( *this, mpSlidePersistPtr, meShapeLocation, mpGroupShapePtr, oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.GroupShape" ) ) );
     case PPT_TOKEN( sp ):           // Shape
         {
-            boost::shared_ptr<PPTShape> pShape( new PPTShape( meShapeLocation, "com.sun.star.drawing.CustomShape" ) );
+            std::shared_ptr<PPTShape> pShape( new PPTShape( meShapeLocation, "com.sun.star.drawing.CustomShape" ) );
             if( rAttribs.getBool( XML_useBgFill, false ) )
             {
                 ::oox::drawingml::FillProperties &aFill = pShape->getFillProperties();