diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-05-12 12:13:42 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-13 10:02:02 +0200 |
| commit | 1bf1c56ce05a08e09c3f7def4962ef7f7ae885d9 (patch) | |
| tree | 7d6548ff3ab14564b8dcca89d170cb1e81391da2 /chart2/source/tools/DataSeriesHelper.cxx | |
| parent | ca7f34acabfbb92e76aa367458056a75bd99991b (diff) | |
Remove ContainerHelper.hxx
Use comphelper::sequenceToContainer instead of ContainerHelper::SequenceToVector
Change-Id: I4834255a1349ac7a29127a84a54fcfa98d678d00
Reviewed-on: https://gerrit.libreoffice.org/72186
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/tools/DataSeriesHelper.cxx')
| -rw-r--r-- | chart2/source/tools/DataSeriesHelper.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 389a10ededb8..480c6dafa596 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -19,7 +19,6 @@ #include <DataSeriesHelper.hxx> #include <DataSource.hxx> -#include <ContainerHelper.hxx> #include <unonames.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -517,8 +516,8 @@ void deleteSeries( try { Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY_THROW ); - std::vector< Reference< chart2::XDataSeries > > aSeries( - ContainerHelper::SequenceToVector( xSeriesCnt->getDataSeries())); + auto aSeries( + comphelper::sequenceToContainer<std::vector< Reference< chart2::XDataSeries > > >( xSeriesCnt->getDataSeries())); std::vector< Reference< chart2::XDataSeries > >::iterator aIt = std::find( aSeries.begin(), aSeries.end(), xSeries ); if( aIt != aSeries.end()) @@ -692,7 +691,7 @@ sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Refere xProp->getPropertyValue( "HiddenValues" ) >>= aHiddenIndicesSeq; if( aHiddenIndicesSeq.getLength() ) { - std::vector< sal_Int32 > aHiddenIndices( ContainerHelper::SequenceToVector( aHiddenIndicesSeq ) ); + auto aHiddenIndices( comphelper::sequenceToContainer<std::vector< sal_Int32 >>( aHiddenIndicesSeq ) ); std::sort( aHiddenIndices.begin(), aHiddenIndices.end() ); sal_Int32 nHiddenCount = static_cast<sal_Int32>(aHiddenIndices.size()); @@ -777,7 +776,7 @@ bool hasDataLabelAtPoint( const Reference< chart2::XDataSeries >& xSeries, sal_I uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { - std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) ); + auto aIndices( comphelper::sequenceToContainer<std::vector< sal_Int32 >>( aAttributedDataPointIndexList ) ); std::vector< sal_Int32 >::iterator aIt = std::find( aIndices.begin(), aIndices.end(), nPointIndex ); if( aIt != aIndices.end()) xProp = xSeries->getDataPointByIndex(nPointIndex); |