diff options
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/framework/configuration/Configuration.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/unoidl/DrawController.cxx | 7 |
3 files changed, 4 insertions, 17 deletions
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index e930f9dcc072..70b59105ca37 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -168,12 +168,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( aResources.push_back(*iResource); } - // Copy the resources from the vector into a new sequence. - Sequence<Reference<XResourceId> > aResult (aResources.size()); - for (size_t nIndex=0; nIndex<aResources.size(); ++nIndex) - aResult[nIndex] = aResources[nIndex]; - - return aResult; + return comphelper::containerToSequence(aResources); } sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxResourceId) diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index cd9d91f9c589..44044b639fed 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -479,13 +479,8 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow PropertyState_DIRECT_VALUE)); } - // Convert vector into uno Sequence. - Sequence< PropertyValue > aPropertySequence (aProperties.size()); - for (int nIndex=0,nCount=aProperties.size();nIndex<nCount; ++nIndex) - aPropertySequence[nIndex] = aProperties[nIndex]; - if( getSlideAPI( nCurrentSlideNumber, xSlide, xAnimNode ) ) - xShow->displaySlide( xSlide, xDrawPages, xAnimNode, aPropertySequence ); + xShow->displaySlide( xSlide, xDrawPages, xAnimNode, comphelper::containerToSequence(aProperties) ); } } diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 7612ca1d6a0a..e660f5ca288b 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -676,11 +676,8 @@ IPropertyArrayHelper & DrawController::getInfoHelper() if (mpPropertyArrayHelper.get() == nullptr) { ::std::vector<beans::Property> aProperties; - FillPropertyTable (aProperties); - Sequence<beans::Property> aPropertySequence (aProperties.size()); - for (size_t i=0; i<aProperties.size(); i++) - aPropertySequence[i] = aProperties[i]; - mpPropertyArrayHelper.reset(new OPropertyArrayHelper(aPropertySequence, sal_False)); + FillPropertyTable(aProperties); + mpPropertyArrayHelper.reset(new OPropertyArrayHelper(comphelper::containerToSequence(aProperties), sal_False)); } return *mpPropertyArrayHelper.get(); |