diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-19 08:40:27 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-19 09:55:18 +0000 |
commit | 8f2522f931df9f1f24ef7016ee64d75fd23af000 (patch) | |
tree | 59ad157d1683dc311e8688c5b4193754f0e178b8 /include/oox/drawingml | |
parent | c7efcb1340ceee35fe3b8ffd9ed86b8cae57d9ce (diff) |
boost->std
Change-Id: Icae6b6f07ad8dbd287fdfc689739187883a07775
Diffstat (limited to 'include/oox/drawingml')
-rw-r--r-- | include/oox/drawingml/chart/modelbase.hxx | 4 | ||||
-rw-r--r-- | include/oox/drawingml/clrscheme.hxx | 6 | ||||
-rw-r--r-- | include/oox/drawingml/color.hxx | 6 | ||||
-rw-r--r-- | include/oox/drawingml/drawingmltypes.hxx | 21 |
4 files changed, 18 insertions, 19 deletions
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 <boost/shared_ptr.hpp> #include <map> +#include <memory> #include <vector> #include <oox/drawingml/color.hxx> #include <oox/dllapi.h> @@ -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 <vector> -#include <boost/shared_ptr.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <sal/types.h> @@ -29,6 +27,8 @@ #include <rtl/ustring.hxx> #include <oox/helper/helper.hxx> #include <oox/dllapi.h> +#include <memory> +#include <vector> 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 <memory> -#include <boost/shared_ptr.hpp> #include <com/sun/star/style/TabAlign.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/Hatch.hpp> @@ -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 |