diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-17 11:33:26 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-17 15:04:23 +0100 |
| commit | a1d9b5efb5df35d21384d04893429e48e79ff601 (patch) | |
| tree | eb1a7b9b9c49d565355f5c623178b8037338083d /oox | |
| parent | SkipImages option for PDF import (diff) | |
| download | core-a1d9b5efb5df35d21384d04893429e48e79ff601.tar.gz core-a1d9b5efb5df35d21384d04893429e48e79ff601.zip | |
oox: use std::enable_shared_from_this
Change-Id: I184a7a3579bebd81d5d81f64b4ace74bde8e87fb
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/drawingml/customshapeproperties.hxx | 4 | ||||
| -rw-r--r-- | oox/source/ppt/pptshapegroupcontext.cxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx index d5fbd88a047d..5826a0dd6850 100644 --- a/oox/inc/drawingml/customshapeproperties.hxx +++ b/oox/inc/drawingml/customshapeproperties.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX #define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX -#include <boost/shared_ptr.hpp> +#include <memory> #include <unordered_map> #include <vector> #include <map> @@ -46,7 +46,7 @@ namespace oox { namespace drawingml { class CustomShapeProperties; -typedef boost::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr; +typedef std::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr; struct CustomShapeGuide { diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx index fb6f7803307c..975906d797f6 100644 --- a/oox/source/ppt/pptshapegroupcontext.cxx +++ b/oox/source/ppt/pptshapegroupcontext.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <memory> #include <com/sun/star/xml/sax/FastToken.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/container/XNamed.hpp> @@ -94,7 +95,7 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( sal_Int32 aElementToken return new PPTShapeGroupContext( *this, mpSlidePersistPtr, meShapeLocation, mpGroupShapePtr, oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.GroupShape" ) ) ); case PPT_TOKEN( sp ): // Shape { - boost::shared_ptr<PPTShape> pShape( new PPTShape( meShapeLocation, "com.sun.star.drawing.CustomShape" ) ); + std::shared_ptr<PPTShape> pShape( new PPTShape( meShapeLocation, "com.sun.star.drawing.CustomShape" ) ); if( rAttribs.getBool( XML_useBgFill, false ) ) { ::oox::drawingml::FillProperties &aFill = pShape->getFillProperties(); |