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 /oox/source/shape | |
| parent | c7efcb1340ceee35fe3b8ffd9ed86b8cae57d9ce (diff) | |
boost->std
Change-Id: Icae6b6f07ad8dbd287fdfc689739187883a07775
Diffstat (limited to 'oox/source/shape')
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index aed94381a41b..e4910ad037d0 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -28,8 +28,8 @@ #include "oox/vml/vmldrawingfragment.hxx" #include "oox/vml/vmlshape.hxx" #include "oox/drawingml/themefragmenthandler.hxx" -#include <boost/scoped_ptr.hpp> #include <cppuhelper/supportsservice.hxx> +#include <memory> namespace oox { namespace shape { @@ -105,7 +105,7 @@ uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getChartShape { case XML_chart: { - boost::scoped_ptr<ContextHandler2Helper> pFragmentHandler( + std::unique_ptr<ContextHandler2Helper> pFragmentHandler( new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath)); mpShape.reset(new Shape("com.sun.star.drawing.OLE2Shape" )); mxChartShapeContext.set(new ChartGraphicDataContext(*pFragmentHandler, mpShape, true)); @@ -170,7 +170,7 @@ ShapeContextHandler::getGraphicShapeContext(::sal_Int32 Element ) { if (! mxGraphicShapeContext.is()) { - boost::shared_ptr<ContextHandler2Helper> pFragmentHandler + std::shared_ptr<ContextHandler2Helper> pFragmentHandler (new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath)); ShapePtr pMasterShape; @@ -226,7 +226,7 @@ ShapeContextHandler::getDiagramShapeContext() { if (!mxDiagramShapeContext.is()) { - boost::shared_ptr<ContextHandler2Helper> pFragmentHandler(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath)); + std::shared_ptr<ContextHandler2Helper> pFragmentHandler(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath)); mpShape.reset(new Shape()); mxDiagramShapeContext.set(new DiagramGraphicDataContext(*pFragmentHandler, mpShape)); } @@ -428,7 +428,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception) if ( getContextHandler() == getDrawingShapeContext() ) { mpDrawing->finalizeFragmentImport(); - if( boost::shared_ptr< vml::ShapeBase > pShape = mpDrawing->getShapes().takeLastShape() ) + if( std::shared_ptr< vml::ShapeBase > pShape = mpDrawing->getShapes().takeLastShape() ) xResult = pShape->convertAndInsert( xShapes ); // Only now remove the recursion mark, because getShape() is called in writerfilter // after endFastElement(). |