diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-17 11:33:26 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-17 15:04:23 +0100 |
| commit | a1d9b5efb5df35d21384d04893429e48e79ff601 (patch) | |
| tree | eb1a7b9b9c49d565355f5c623178b8037338083d /include/oox/drawingml/shape.hxx | |
| parent | 98b27ea907517d585f5d951895ae733653a442d2 (diff) | |
oox: use std::enable_shared_from_this
Change-Id: I184a7a3579bebd81d5d81f64b4ace74bde8e87fb
Diffstat (limited to 'include/oox/drawingml/shape.hxx')
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
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 <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. |