diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2017-10-17 22:10:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-18 08:40:48 +0200 |
| commit | 695c15ed6e8c4d0236970798f463c7488a903a38 (patch) | |
| tree | 60038582f7a83e6ec99676d0e8c7a38164ed2040 /include/oox | |
| parent | 48a67502e657761b3c5f70adf732f4763fb8035a (diff) | |
Replace lists by vectors in oox
Change-Id: I951466552fd1cdb3b8f1cbfc07e64f5e0424552e
Reviewed-on: https://gerrit.libreoffice.org/43469
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/ppt/animationspersist.hxx | 6 | ||||
| -rw-r--r-- | include/oox/ppt/slidepersist.hxx | 6 | ||||
| -rw-r--r-- | include/oox/ppt/timenode.hxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx index a10c9c6d573e..cd18b9101615 100644 --- a/include/oox/ppt/animationspersist.hxx +++ b/include/oox/ppt/animationspersist.hxx @@ -22,7 +22,7 @@ #define INCLUDED_OOX_PPT_ANIMATIONSPERSIST_HXX #include <array> -#include <list> +#include <vector> #include <memory> #include <com/sun/star/uno/Any.hxx> @@ -85,7 +85,7 @@ namespace oox { namespace ppt { struct AnimationCondition; - typedef std::list< AnimationCondition > AnimationConditionList; + typedef std::vector< AnimationCondition > AnimationConditionList; /** data for CT_TLTimeCondition */ struct AnimationCondition @@ -113,7 +113,7 @@ namespace oox { namespace ppt { css::uno::Any maValue; }; - typedef ::std::list< TimeAnimationValue > TimeAnimationValueList; + typedef ::std::vector< TimeAnimationValue > TimeAnimationValueList; } } diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index ae6d8b2b1680..cd1ca4ec4e07 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_PPT_SLIDEPERSIST_HXX #define INCLUDED_OOX_PPT_SLIDEPERSIST_HXX -#include <list> +#include <vector> #include <map> #include <memory> @@ -109,7 +109,7 @@ public: const oox::drawingml::ShapePtr& getShapes() { return maShapesPtr; } void hideShapesAsMasterShapes(); - ::std::list< std::shared_ptr< TimeNode > >& getTimeNodeList() { return maTimeNodeList; } + ::std::vector< std::shared_ptr< TimeNode > >& getTimeNodeList() { return maTimeNodeList; } oox::ppt::HeaderFooter& getHeaderFooter(){ return maHeaderFooter; }; oox::vml::Drawing* getDrawing() { return mpDrawingPtr.get(); } @@ -138,7 +138,7 @@ private: oox::drawingml::ShapePtr maShapesPtr; oox::drawingml::Color maBackgroundColor; oox::drawingml::FillPropertiesPtr mpBackgroundPropertiesPtr; - ::std::list< std::shared_ptr< TimeNode > > maTimeNodeList; + ::std::vector< 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 0c3cd403b93d..1aee1a893ed3 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 <list> +#include <vector> #include <map> #include <memory> @@ -44,7 +44,7 @@ namespace oox { namespace ppt { class TimeNode; typedef std::shared_ptr< TimeNode > TimeNodePtr; - typedef std::list< TimeNodePtr > TimeNodePtrList; + typedef std::vector< TimeNodePtr > TimeNodePtrList; class TimeNode final { |