diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 09:21:43 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 11:00:51 +0100 |
commit | eaf2c278888ebca0ac99055ee34df6f011da3596 (patch) | |
tree | 3177ca36a5eeac09b791ded9fc55d2d82e52c9cd /oox/source/shape | |
parent | 498cb0b3a372ce1ec0e66640eb0badddff3f2e90 (diff) |
boost->std
Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a
Diffstat (limited to 'oox/source/shape')
-rw-r--r-- | oox/source/shape/ShapeContextHandler.hxx | 8 | ||||
-rw-r--r-- | oox/source/shape/ShapeFilterBase.hxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx index 72b9f882b384..ca9aecf713e4 100644 --- a/oox/source/shape/ShapeContextHandler.hxx +++ b/oox/source/shape/ShapeContextHandler.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX #define INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX -#include <boost/shared_ptr.hpp> +#include <memory> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp> @@ -37,7 +37,7 @@ namespace oox { namespace shape { class ShapeFragmentHandler : public core::FragmentHandler2 { public: - typedef boost::shared_ptr<ShapeFragmentHandler> Pointer_t; + typedef std::shared_ptr<ShapeFragmentHandler> Pointer_t; explicit ShapeFragmentHandler(core::XmlFilterBase& rFilter, const OUString& rFragmentPath ) @@ -153,9 +153,9 @@ private: css::uno::Reference< css::uno::XComponentContext > m_xContext; drawingml::ShapePtr mpShape; - ::boost::shared_ptr< vml::Drawing > mpDrawing; + std::shared_ptr< vml::Drawing > mpDrawing; - typedef boost::shared_ptr<drawingml::GraphicShapeContext> + typedef std::shared_ptr<drawingml::GraphicShapeContext> GraphicShapeContextPtr; css::uno::Reference<XFastContextHandler> mxDrawingFragmentHandler; css::uno::Reference<XFastContextHandler> mxGraphicShapeContext; diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx index 06d4722bd8a4..171e27419a07 100644 --- a/oox/source/shape/ShapeFilterBase.hxx +++ b/oox/source/shape/ShapeFilterBase.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPEFILTERBASE_HXX #define INCLUDED_OOX_SOURCE_SHAPE_SHAPEFILTERBASE_HXX -#include <boost/shared_ptr.hpp> +#include <memory> #include <rtl/ref.hxx> #include "oox/vml/vmldrawing.hxx" #include "drawingml/table/tablestylelist.hxx" @@ -33,7 +33,7 @@ namespace shape { class ShapeFilterBase : public core::XmlFilterBase { public: - typedef boost::shared_ptr<ShapeFilterBase> Pointer_t; + typedef std::shared_ptr<ShapeFilterBase> Pointer_t; explicit ShapeFilterBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) @@ -64,7 +64,7 @@ private: virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; - ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; + std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; ::oox::drawingml::ThemePtr mpTheme; }; |