summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-19 09:14:59 +0200
committerNoel Grandin <noel@peralex.com>2015-11-19 09:33:29 +0200
commit2554efabb6d7cd2ad9f7cfdddd0712c25cdca1cd (patch)
tree1b8fd3940910ffcd328e16a53e208c099f67ab21 /sd
parentf7b5f477bfd942e0a1d8880c372635000d724dd7 (diff)
use comphelper::containerToSequence
in chart2, we remove a local equivalent of the method Change-Id: I25129a3d1ea1dd724eb9cd38a57be37a78b3d100
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/framework/configuration/Configuration.cxx7
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx7
-rw-r--r--sd/source/ui/unoidl/DrawController.cxx7
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();