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/ppt | |
| parent | tdf#83099 fix Top of formula bar is missing when expanding on Windows 7 (diff) | |
| download | core-8f2522f931df9f1f24ef7016ee64d75fd23af000.tar.gz core-8f2522f931df9f1f24ef7016ee64d75fd23af000.zip | |
boost->std
Change-Id: Icae6b6f07ad8dbd287fdfc689739187883a07775
Diffstat (limited to 'include/oox/ppt')
| -rw-r--r-- | include/oox/ppt/animationspersist.hxx | 6 | ||||
| -rw-r--r-- | include/oox/ppt/pptimport.hxx | 2 | ||||
| -rw-r--r-- | include/oox/ppt/slidepersist.hxx | 6 | ||||
| -rw-r--r-- | include/oox/ppt/timenode.hxx | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx index 6f1438c88e50..2b27736b6dc4 100644 --- a/include/oox/ppt/animationspersist.hxx +++ b/include/oox/ppt/animationspersist.hxx @@ -22,7 +22,7 @@ #define INCLUDED_OOX_PPT_ANIMATIONSPERSIST_HXX #include <list> -#include <boost/shared_ptr.hpp> +#include <memory> #include <boost/array.hpp> #include <rtl/ustring.hxx> @@ -84,11 +84,11 @@ namespace oox { namespace ppt { ShapeTargetElement maShapeTarget; }; - typedef boost::shared_ptr< AnimTargetElement > AnimTargetElementPtr; + typedef std::shared_ptr< AnimTargetElement > AnimTargetElementPtr; struct AnimationCondition; - typedef ::std::list< AnimationCondition > AnimationConditionList; + typedef std::list< AnimationCondition > AnimationConditionList; /** data for CT_TLTimeCondition */ struct AnimationCondition diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 8ec789eaab9f..02f0f4b328df 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -82,7 +82,7 @@ private: std::vector< SlidePersistPtr > maMasterPages; std::vector< SlidePersistPtr > maNotesPages; - ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; + std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; }; } } diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index 4bed15ed7bec..db4f7e605b7e 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -102,7 +102,7 @@ public: oox::drawingml::ShapePtr getShapes() { return maShapesPtr; } void hideShapesAsMasterShapes(); - ::std::list< boost::shared_ptr< TimeNode > >& getTimeNodeList() { return maTimeNodeList; } + ::std::list< std::shared_ptr< TimeNode > >& getTimeNodeList() { return maTimeNodeList; } oox::ppt::HeaderFooter& getHeaderFooter(){ return maHeaderFooter; }; oox::vml::Drawing* getDrawing() { return mpDrawingPtr.get(); } @@ -121,7 +121,7 @@ public: private: OUString maPath; OUString maLayoutPath; - ::boost::shared_ptr< oox::vml::Drawing > mpDrawingPtr; + std::shared_ptr< oox::vml::Drawing > mpDrawingPtr; com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxPage; oox::drawingml::ThemePtr mpThemePtr; // the theme that is used oox::drawingml::ClrSchemePtr mpClrSchemePtr; // the local color scheme (if any) @@ -131,7 +131,7 @@ private: oox::drawingml::ShapePtr maShapesPtr; oox::drawingml::Color maBackgroundColor; oox::drawingml::FillPropertiesPtr mpBackgroundPropertiesPtr; - ::std::list< boost::shared_ptr< TimeNode > > maTimeNodeList; + ::std::list< std::shared_ptr< TimeNode > > maTimeNodeList; oox::ppt::HeaderFooter maHeaderFooter; sal_Int32 mnLayoutValueToken; diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx index 9c8eda4666b5..9115ab77015b 100644 --- a/include/oox/ppt/timenode.hxx +++ b/include/oox/ppt/timenode.hxx @@ -21,7 +21,7 @@ #ifndef INCLUDED_OOX_PPT_TIMENODE_HXX #define INCLUDED_OOX_PPT_TIMENODE_HXX -#include <boost/shared_ptr.hpp> +#include <memory> #include <vector> #include <list> #include <rtl/ustring.hxx> @@ -38,8 +38,8 @@ namespace oox { namespace ppt { class TimeNode; class SlideTransition; - typedef boost::shared_ptr< TimeNode > TimeNodePtr; - typedef ::std::list< TimeNodePtr > TimeNodePtrList; + typedef std::shared_ptr< TimeNode > TimeNodePtr; + typedef std::list< TimeNodePtr > TimeNodePtrList; class TimeNode { |