summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-02-17 11:33:26 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-02-17 15:04:23 +0100
commita1d9b5efb5df35d21384d04893429e48e79ff601 (patch)
treeeb1a7b9b9c49d565355f5c623178b8037338083d /include
parent98b27ea907517d585f5d951895ae733653a442d2 (diff)
oox: use std::enable_shared_from_this
Change-Id: I184a7a3579bebd81d5d81f64b4ace74bde8e87fb
Diffstat (limited to 'include')
-rw-r--r--include/oox/drawingml/drawingmltypes.hxx3
-rw-r--r--include/oox/drawingml/shape.hxx11
-rw-r--r--include/oox/ppt/slidepersist.hxx6
3 files changed, 10 insertions, 10 deletions
diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index 6c6dee122fea..2287c668d1ae 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 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.
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 1a3f473b619b..4bed15ed7bec 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: