diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2017-09-01 20:26:57 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2017-09-01 21:24:41 +0200 |
| commit | 8d6e1a1c51b2591ed941170e7275fd054a0cc76f (patch) | |
| tree | 969f1b8e09a46dbfc94ebc7d816857654f1f7232 /sd | |
| parent | 5b6c69a666e9a22c369ac7dff0f5a6c4470b4a71 (diff) | |
Replace some lists by vectors in sd module
Change-Id: I07d20af39985da0a340d482e769d98cbe073a826
Reviewed-on: https://gerrit.libreoffice.org/41801
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/pptexanimations.cxx | 8 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptexanimations.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationList.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 40e00edfff25..65c8ba385d31 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -408,8 +408,8 @@ void AnimationExporter::processAfterEffectNodes( const Reference< XAnimationNode bool AnimationExporter::isAfterEffectNode( const Reference< XAnimationNode >& xNode ) const { - const std::list< AfterEffectNodePtr >::const_iterator aEnd( maAfterEffectNodes.end() ); - for (std::list< AfterEffectNodePtr >::const_iterator aIter( maAfterEffectNodes.begin() ); + const std::vector< AfterEffectNodePtr >::const_iterator aEnd( maAfterEffectNodes.end() ); + for (std::vector< AfterEffectNodePtr >::const_iterator aIter( maAfterEffectNodes.begin() ); aIter != aEnd ; ++aIter) { if( (*aIter)->mxNode == xNode ) @@ -420,8 +420,8 @@ bool AnimationExporter::isAfterEffectNode( const Reference< XAnimationNode >& xN bool AnimationExporter::hasAfterEffectNode( const Reference< XAnimationNode >& xNode, Reference< XAnimationNode >& xAfterEffectNode ) const { - const std::list< AfterEffectNodePtr >::const_iterator aEnd( maAfterEffectNodes.end() ); - for (std::list< AfterEffectNodePtr >::const_iterator aIter( maAfterEffectNodes.begin() ); + const std::vector< AfterEffectNodePtr >::const_iterator aEnd( maAfterEffectNodes.end() ); + for (std::vector< AfterEffectNodePtr >::const_iterator aIter( maAfterEffectNodes.begin() ); aIter != aEnd ; ++aIter) { if( (*aIter)->mxMaster == xNode ) diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index 05583164b2d5..a3b12f968cb9 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -33,7 +33,7 @@ #include <memory> -#include <list> +#include <vector> class SvStream; @@ -107,7 +107,7 @@ class AnimationExporter static css::uno::Reference< css::animations::XAnimationNode > createAfterEffectNodeClone( const css::uno::Reference< css::animations::XAnimationNode >& xNode ); - std::list< AfterEffectNodePtr > maAfterEffectNodes; + std::vector< AfterEffectNodePtr > maAfterEffectNodes; public: AnimationExporter( const EscherSolverContainer& rSolverContainer, ppt::ExSoundCollection& rExSoundCollection ); diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index f02a68de93ae..bf13da48983c 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -556,8 +556,8 @@ void CustomAnimationList::update() CustomAnimationListEntry* pEntry = nullptr; - std::list< CustomAnimationEffectPtr > aExpanded; - std::list< CustomAnimationEffectPtr > aSelected; + std::vector< CustomAnimationEffectPtr > aExpanded; + std::vector< CustomAnimationEffectPtr > aSelected; CustomAnimationEffectPtr pFirstSelEffect; CustomAnimationEffectPtr pLastSelEffect; |