From a1d9b5efb5df35d21384d04893429e48e79ff601 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 17 Feb 2015 11:33:26 +0100 Subject: oox: use std::enable_shared_from_this Change-Id: I184a7a3579bebd81d5d81f64b4ace74bde8e87fb --- include/oox/drawingml/shape.hxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'include/oox/drawingml/shape.hxx') diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index e3ccce306d52..052d60c919fe 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -27,8 +27,7 @@ #include #include -#include -#include +#include #include #include #include @@ -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. -- cgit