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>

3 files changed, 11 insertions, 10 deletions

diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 5b5236da80de..94fa8592c1aa 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -20,7 +20,6 @@
 #include <BaseCoordinateSystem.hxx>
 #include <PropertyHelper.hxx>
 #include <UserDefinedProperties.hxx>
-#include <ContainerHelper.hxx>
 #include <CloneHelper.hxx>
 #include <ModifyListenerHelper.hxx>
 #include "Axis.hxx"
@@ -274,7 +273,7 @@ Sequence< Reference< chart2::XChartType > > SAL_CALL BaseCoordinateSystem::getCh
 void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< chart2::XChartType > >& aChartTypes )
 {
     ModifyListenerHelper::removeListenerFromAllElements( m_aChartTypes, m_xModifyEventForwarder );
-    m_aChartTypes = ContainerHelper::SequenceToVector( aChartTypes );
+    m_aChartTypes = comphelper::sequenceToContainer<std::vector< css::uno::Reference< css::chart2::XChartType > >>( aChartTypes );
     ModifyListenerHelper::addListenerToAllElements( m_aChartTypes, m_xModifyEventForwarder );
     fireModifyEvent();
 }
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 7b8e7ec57f94..6fdc432a5aab 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -24,7 +24,6 @@
 #include <UserDefinedProperties.hxx>
 #include "DataPoint.hxx"
 #include <DataSeriesHelper.hxx>
-#include <ContainerHelper.hxx>
 #include <CloneHelper.hxx>
 #include <ModifyListenerHelper.hxx>
 #include <EventListenerHelper.hxx>
@@ -395,7 +394,7 @@ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data:
         xModifyEventForwarder = m_xModifyEventForwarder;
         xListener = this;
         std::swap( aOldDataSequences, m_aDataSequences );
-        aNewDataSequences = ContainerHelper::SequenceToVector( aData );
+        aNewDataSequences = comphelper::sequenceToContainer<tDataSequenceContainer>( aData );
         m_aDataSequences = aNewDataSequences;
     }
     ModifyListenerHelper::removeListenerFromAllElements( aOldDataSequences, xModifyEventForwarder );
@@ -462,7 +461,7 @@ void SAL_CALL DataSeries::setRegressionCurves(
     const Sequence< Reference< chart2::XRegressionCurve > >& aRegressionCurves )
 {
     tRegressionCurveContainerType aOldCurves;
-    tRegressionCurveContainerType aNewCurves( ContainerHelper::SequenceToVector( aRegressionCurves ) );
+    auto aNewCurves( comphelper::sequenceToContainer<tRegressionCurveContainerType>( aRegressionCurves ) );
     Reference< util::XModifyListener > xModifyEventForwarder;
     {
         MutexGuard aGuard( m_aMutex );
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index e203fec8316b..652b99bc94f6 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -20,7 +20,6 @@
 #include "Title.hxx"
 #include <LinePropertiesHelper.hxx>
 #include <FillProperties.hxx>
-#include <ContainerHelper.hxx>
 #include <CloneHelper.hxx>
 #include <PropertyHelper.hxx>
 #include <ModifyListenerHelper.hxx>
@@ -241,13 +240,15 @@ Title::Title( const Title & rOther ) :
     CloneHelper::CloneRefSequence<chart2::XFormattedString>(
         rOther.m_aStrings, m_aStrings );
     ModifyListenerHelper::addListenerToAllElements(
-        ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder );
+        comphelper::sequenceToContainer<std::vector<uno::Reference< chart2::XFormattedString > > >( m_aStrings ),
+        m_xModifyEventForwarder );
 }
 
 Title::~Title()
 {
     ModifyListenerHelper::removeListenerFromAllElements(
-        ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder );
+        comphelper::sequenceToContainer<std::vector<uno::Reference< chart2::XFormattedString > > >( m_aStrings ),
+        m_xModifyEventForwarder );
 }
 
 // ____ XCloneable ____
@@ -273,9 +274,11 @@ void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XForm
     }
     //don't keep the mutex locked while calling out
     ModifyListenerHelper::removeListenerFromAllElements(
-        ContainerHelper::SequenceToVector( aOldStrings ), m_xModifyEventForwarder );
+        comphelper::sequenceToContainer<std::vector<uno::Reference< chart2::XFormattedString > > >( aOldStrings ),
+        m_xModifyEventForwarder );
     ModifyListenerHelper::addListenerToAllElements(
-        ContainerHelper::SequenceToVector( rNewStrings ), m_xModifyEventForwarder );
+        comphelper::sequenceToContainer<std::vector<uno::Reference< chart2::XFormattedString > > >( rNewStrings ),
+        m_xModifyEventForwarder );
     fireModifyEvent();
 }