Kaydet (Commit) a1d9b5ef authored tarafından Miklos Vajna's avatar Miklos Vajna

oox: use std::enable_shared_from_this

Change-Id: I184a7a3579bebd81d5d81f64b4ace74bde8e87fb
üst 98b27ea9
......@@ -20,6 +20,7 @@
#ifndef INCLUDED_OOX_DRAWINGML_DRAWINGMLTYPES_HXX
#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>
......@@ -72,7 +73,7 @@ class TextListStyle;
typedef boost::shared_ptr< TextListStyle > TextListStylePtr;
class Shape;
typedef ::boost::shared_ptr< Shape > ShapePtr;
typedef std::shared_ptr< Shape > ShapePtr;
class Theme;
typedef ::boost::shared_ptr< Theme > ThemePtr;
......
......@@ -27,8 +27,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <memory>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <vector>
#include <map>
......@@ -41,7 +40,7 @@ namespace oox { namespace vml {
namespace oox { namespace drawingml {
class CustomShapeProperties;
typedef boost::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr;
typedef std::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr;
typedef ::std::map< OUString, ShapePtr > ShapeIdMap;
......@@ -73,7 +72,7 @@ struct LinkedTxbxAttr
};
class OOX_DLLPUBLIC Shape
: public boost::enable_shared_from_this< Shape >
: public std::enable_shared_from_this< Shape >
{
public:
......@@ -283,8 +282,8 @@ private:
FRAMETYPE_TABLE ///< A table embedded in a shape.
};
typedef ::boost::shared_ptr< ::oox::vml::OleObjectInfo > OleObjectInfoRef;
typedef ::boost::shared_ptr< ChartShapeInfo > ChartShapeInfoRef;
typedef std::shared_ptr< ::oox::vml::OleObjectInfo > OleObjectInfoRef;
typedef std::shared_ptr< ChartShapeInfo > ChartShapeInfoRef;
FrameType meFrameType; ///< Type for graphic frame shapes.
OleObjectInfoRef mxOleObjectInfo; ///< Additional data for OLE objects.
......
......@@ -20,7 +20,7 @@
#ifndef INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
#define INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
#include <boost/shared_ptr.hpp>
#include <memory>
#include <oox/drawingml/shape.hxx>
#include <oox/drawingml/theme.hxx>
#include <oox/drawingml/clrscheme.hxx>
......@@ -48,9 +48,9 @@ enum ShapeLocation
class TimeNode;
class SlidePersist;
typedef boost::shared_ptr< SlidePersist > SlidePersistPtr;
typedef std::shared_ptr< SlidePersist > SlidePersistPtr;
class SlidePersist : public boost::enable_shared_from_this< SlidePersist >
class SlidePersist : public std::enable_shared_from_this< SlidePersist >
{
public:
......
......@@ -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
{
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment