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/controller | |
| 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/controller')
| -rw-r--r-- | chart2/source/controller/dialogs/DialogModel.cxx | 7 | ||||
| -rw-r--r-- | chart2/source/controller/main/ChartController_Window.cxx | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 11a616a34f8e..a363c6cc6fc8 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -24,7 +24,6 @@ #include <DiagramHelper.hxx> #include <strings.hrc> #include <ResId.hxx> -#include <ContainerHelper.hxx> #include <ControllerLockGuard.hxx> #include <ChartTypeHelper.hxx> #include <ThreeDHelper.hxx> @@ -489,7 +488,7 @@ void addNewSeriesToContainer( const Reference<XDataSeries>& xNewSeries ) { Reference<XDataSeriesContainer> xSeriesCnt(xChartType, uno::UNO_QUERY_THROW); - std::vector<Reference<XDataSeries> > aSeries = ContainerHelper::SequenceToVector(xSeriesCnt->getDataSeries()); + auto aSeries = comphelper::sequenceToContainer<std::vector<Reference<XDataSeries> >>(xSeriesCnt->getDataSeries()); std::vector<Reference<XDataSeries> >::iterator aIt = std::find( aSeries.begin(), aSeries.end(), xSeries); @@ -819,8 +818,8 @@ void DialogModel::applyInterpretedData( // data series std::vector< Reference< XDataSeriesContainer > > aSeriesCnt( getAllDataSeriesContainers()); - std::vector< Sequence< Reference< XDataSeries > > > aNewSeries( - ContainerHelper::SequenceToVector( rNewData.Series )); + auto aNewSeries( + comphelper::sequenceToContainer<std::vector< Sequence< Reference< XDataSeries > > >>( rNewData.Series )); OSL_ASSERT( aSeriesCnt.size() == aNewSeries.size()); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index f63126747058..c928be0e3a17 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -39,7 +39,6 @@ #include <RegressionCurveHelper.hxx> #include <StatisticsHelper.hxx> #include <DataSeriesHelper.hxx> -#include <ContainerHelper.hxx> #include <AxisHelper.hxx> #include <LegendHelper.hxx> #include <servicenames_charttypes.hxx> @@ -63,6 +62,7 @@ #include <comphelper/lok.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/propertyvalue.hxx> +#include <comphelper/sequence.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -1054,7 +1054,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) { if( bIsPoint ) { - 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()) bSelectedPointIsFormatted = true; |