From 8f2522f931df9f1f24ef7016ee64d75fd23af000 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 19 Feb 2015 08:40:27 +0000 Subject: boost->std Change-Id: Icae6b6f07ad8dbd287fdfc689739187883a07775 --- include/oox/drawingml/chart/modelbase.hxx | 4 ++-- include/oox/drawingml/clrscheme.hxx | 6 +++--- include/oox/drawingml/color.hxx | 6 +++--- include/oox/drawingml/drawingmltypes.hxx | 21 ++++++++++----------- 4 files changed, 18 insertions(+), 19 deletions(-) (limited to 'include/oox/drawingml') diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx index 68bb9b7e5b24..6819e512449a 100644 --- a/include/oox/drawingml/chart/modelbase.hxx +++ b/include/oox/drawingml/chart/modelbase.hxx @@ -31,11 +31,11 @@ namespace drawingml { namespace chart { template< typename ModelType > -class ModelRef : public ::boost::shared_ptr< ModelType > +class ModelRef : public std::shared_ptr< ModelType > { public: ModelRef() {} - ModelRef( const ::boost::shared_ptr< ModelType >& rxModel ) : ::boost::shared_ptr< ModelType >( rxModel ) {} + ModelRef( const std::shared_ptr< ModelType >& rxModel ) : std::shared_ptr< ModelType >( rxModel ) {} ~ModelRef() {} bool is() const { return this->get() != 0; } diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx index 352f5682ebac..d4303749b701 100644 --- a/include/oox/drawingml/clrscheme.hxx +++ b/include/oox/drawingml/clrscheme.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX #define INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX -#include #include +#include #include #include #include @@ -38,7 +38,7 @@ public: void setColorMap( sal_Int32 nClrToken, sal_Int32 nMappedClrToken ); }; -typedef boost::shared_ptr< ClrMap > ClrMapPtr; +typedef std::shared_ptr< ClrMap > ClrMapPtr; class OOX_DLLPUBLIC ClrScheme { @@ -53,7 +53,7 @@ public: void setColor( sal_Int32 nSchemeClrToken, sal_Int32 nColor ); }; -typedef boost::shared_ptr< ClrScheme > ClrSchemePtr; +typedef std::shared_ptr< ClrScheme > ClrSchemePtr; } } diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index 54318fa21fc9..9b52bf3e18a0 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_OOX_DRAWINGML_COLOR_HXX #define INCLUDED_OOX_DRAWINGML_COLOR_HXX -#include -#include #include #include #include @@ -29,6 +27,8 @@ #include #include #include +#include +#include namespace oox { class GraphicHelper; } @@ -150,7 +150,7 @@ private: maInteropTransformations; /// Unaltered list of transformations for interoperability purposes }; -typedef boost::shared_ptr< Color > ColorPtr; +typedef std::shared_ptr< Color > ColorPtr; diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 2287c668d1ae..621695b550d9 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -21,7 +21,6 @@ #define INCLUDED_OOX_DRAWINGML_DRAWINGMLTYPES_HXX #include -#include #include #include #include @@ -47,43 +46,43 @@ const sal_Int32 MAX_DEGREE = 360 * PER_DEGREE; struct LineProperties; -typedef ::boost::shared_ptr< LineProperties > LinePropertiesPtr; +typedef std::shared_ptr< LineProperties > LinePropertiesPtr; struct FillProperties; -typedef ::boost::shared_ptr< FillProperties > FillPropertiesPtr; +typedef std::shared_ptr< FillProperties > FillPropertiesPtr; struct GraphicProperties; -typedef ::boost::shared_ptr< GraphicProperties > GraphicPropertiesPtr; +typedef std::shared_ptr< GraphicProperties > GraphicPropertiesPtr; struct Shape3DProperties; -typedef ::boost::shared_ptr< Shape3DProperties > Shape3DPropertiesPtr; +typedef std::shared_ptr< Shape3DProperties > Shape3DPropertiesPtr; struct TextCharacterProperties; -typedef ::boost::shared_ptr< TextCharacterProperties > TextCharacterPropertiesPtr; +typedef std::shared_ptr< TextCharacterProperties > TextCharacterPropertiesPtr; struct TextBodyProperties; struct EffectProperties; -typedef ::boost::shared_ptr< EffectProperties > EffectPropertiesPtr; +typedef std::shared_ptr< EffectProperties > EffectPropertiesPtr; class TextBody; -typedef ::boost::shared_ptr< TextBody > TextBodyPtr; +typedef std::shared_ptr< TextBody > TextBodyPtr; class TextListStyle; -typedef boost::shared_ptr< TextListStyle > TextListStylePtr; +typedef std::shared_ptr< TextListStyle > TextListStylePtr; class Shape; typedef std::shared_ptr< Shape > ShapePtr; class Theme; -typedef ::boost::shared_ptr< Theme > ThemePtr; +typedef std::shared_ptr< Theme > ThemePtr; namespace table { class TableProperties; -typedef ::boost::shared_ptr< TableProperties > TablePropertiesPtr; +typedef std::shared_ptr< TableProperties > TablePropertiesPtr; } // namespace table -- cgit