use comphelper::containerToSequence

in chart2, we remove a local equivalent of the method

Change-Id: I25129a3d1ea1dd724eb9cd38a57be37a78b3d100

12 files changed, 31 insertions, 28 deletions

diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 140b523f9ade..891719454084 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -45,6 +45,7 @@
 
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
+#include <comphelper/sequence.hxx>
 
 #include <map>
 
@@ -870,7 +871,7 @@ Sequence< Reference< XAxis > > AxisHelper::getAllAxesOfDiagram(
         }
     }
 
-    return ContainerHelper::ContainerToSequence( aAxisVector );
+    return comphelper::containerToSequence( aAxisVector );
 }
 
 Sequence< Reference< beans::XPropertySet > > AxisHelper::getAllGrids( const Reference< XDiagram >& xDiagram )
@@ -898,7 +899,7 @@ Sequence< Reference< beans::XPropertySet > > AxisHelper::getAllGrids( const Refe
         }
     }
 
-    return ContainerHelper::ContainerToSequence( aGridVector );
+    return comphelper::containerToSequence( aGridVector );
 }
 
 void AxisHelper::getAxisOrGridPossibilities( Sequence< sal_Bool >& rPossibilityList
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index b10b5c7e81e1..cdc4de6b1442 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 
 #include <comphelper/InlineContainer.hxx>
+#include <comphelper/sequence.hxx>
 
 #include <unotools/lingucfg.hxx>
 #include <i18nlangtag/mslangid.hxx>
@@ -490,7 +491,7 @@ awt::FontDescriptor CharacterProperties::createFontDescriptorFromPropertySet(
         ( "CharWordMode")                    // WordLineMode
         ;
 
-    uno::Sequence< OUString > aPropNameSeq( ContainerHelper::ContainerToSequence( aPropNames ));
+    uno::Sequence< OUString > aPropNameSeq( comphelper::containerToSequence( aPropNames ));
     uno::Sequence< uno::Any > aValues( xMultiPropSet->getPropertyValues( aPropNameSeq ));
 
     sal_Int32 i=0;
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 51fb7cd8ab61..69ddf393ef43 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -24,6 +24,7 @@
 #include <unotools/configitem.hxx>
 #include <sal/macros.h>
 #include <cppuhelper/supportsservice.hxx>
+#include <comphelper/sequence.hxx>
 
 #include <set>
 
@@ -88,7 +89,7 @@ void ChartConfigItem::ImplCommit()
 void ChartConfigItem::addPropertyNotification( const OUString & rPropertyName )
 {
     m_aPropertiesToNotify.insert( rPropertyName );
-    EnableNotification( ContainerHelper::ContainerToSequence( m_aPropertiesToNotify ));
+    EnableNotification( comphelper::containerToSequence<OUString>( m_aPropertiesToNotify ));
 }
 
 uno::Any ChartConfigItem::getProperty( const OUString & aPropertyName )
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index eea642e0ace9..e668ccbf4565 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -260,7 +260,7 @@ Reference< chart2::data::XDataSource >
     getDataSource( const Sequence< Reference< chart2::XDataSeries > > & aSeries )
 {
     return Reference< chart2::data::XDataSource >(
-        new DataSource(ContainerHelper::ContainerToSequence(getAllDataSequences(aSeries))));
+        new DataSource(comphelper::containerToSequence(getAllDataSequences(aSeries))));
 }
 
 namespace
@@ -529,7 +529,7 @@ void deleteSeries(
         if( aIt != aSeries.end())
         {
             aSeries.erase( aIt );
-            xSeriesCnt->setDataSeries( ContainerHelper::ContainerToSequence( aSeries ));
+            xSeriesCnt->setDataSeries( comphelper::containerToSequence( aSeries ));
         }
     }
     catch( const uno::Exception & ex )
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 0afe27e51ab7..3413e1a34b5b 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -243,7 +243,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR
 
     ::std::vector< Reference< chart2::XDataSeries > > xSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
     uno::Reference< chart2::data::XDataSource > xSeriesSource(
-        DataSeriesHelper::getDataSource( ContainerHelper::ContainerToSequence(xSeriesVector) ) );
+        DataSeriesHelper::getDataSource( comphelper::containerToSequence(xSeriesVector) ) );
     Sequence< Reference< chart2::data::XLabeledDataSequence > > aDataSeqences( xSeriesSource->getDataSequences() );
 
     //the first x-values is always the next sequence //todo ... other x-values get lost for old format
@@ -260,10 +260,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR
             aResultVector.push_back( aDataSeqences[nN] );
     }
 
-    Sequence< Reference< chart2::data::XLabeledDataSequence > > aResultSequence( aResultVector.size() );
-    ::std::copy( aResultVector.begin(), aResultVector.end(), aResultSequence.getArray() );
-
-    return new DataSource( aResultSequence );
+    return new DataSource( comphelper::containerToSequence(aResultVector) );
 }
 
 uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges(
@@ -287,7 +284,7 @@ uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges(
         }
     }
 
-    return ContainerHelper::ContainerToSequence( aResult );
+    return comphelper::containerToSequence( aResult );
 }
 
 uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< frame::XModel > & xChartModel )
@@ -325,7 +322,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
     }
 
     return uno::Reference< chart2::data::XDataSource >(
-        new DataSource( ContainerHelper::ContainerToSequence( aResult )));
+        new DataSource( comphelper::containerToSequence( aResult )));
 }
 
 uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
@@ -351,7 +348,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
     }
 
     return uno::Reference< chart2::data::XDataSource >(
-        new DataSource( ContainerHelper::ContainerToSequence( aResult )));
+        new DataSource( comphelper::containerToSequence( aResult )));
 }
 
 bool DataSourceHelper::detectRangeSegmentation(
@@ -537,7 +534,7 @@ Sequence< OUString > DataSourceHelper::getRangesFromDataSource( const Reference<
                 aResult.push_back( xValues->getSourceRangeRepresentation());
         }
     }
-    return ContainerHelper::ContainerToSequence( aResult );
+    return comphelper::containerToSequence( aResult );
 }
 
 } //namespace chart
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index c38e6d21c5f3..9a66d5308712 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -58,6 +58,7 @@
 #include <svl/zformat.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <comphelper/sequence.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
@@ -753,7 +754,7 @@ Sequence< Sequence< Reference< XDataSeries > > >
             }
         }
     }
-    return ContainerHelper::ContainerToSequence( aResult );
+    return comphelper::containerToSequence( aResult );
 }
 
 Reference< XChartType >
@@ -1266,7 +1267,7 @@ Sequence< Reference< XChartType > >
         }
     }
 
-    return ContainerHelper::ContainerToSequence( aResult );
+    return comphelper::containerToSequence( aResult );
 }
 
 bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartType >& xFirstType,
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index c22e592028b0..29b866f8eeef 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -440,7 +440,7 @@ void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::da
 uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ErrorBar::getDataSequences()
     throw (uno::RuntimeException, std::exception)
 {
-    return ContainerHelper::ContainerToSequence( m_aDataSequences );
+    return comphelper::containerToSequence( m_aDataSequences );
 }
 
 uno::Sequence< OUString > ErrorBar::getSupportedServiceNames_Static()
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 7ff00f157f9f..4f68d0b65632 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -720,7 +720,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
                         , lcl_aCategoriesRoleName ) ) );
         }
         //don't add the created sequences to the map as they are used temporarily only ...
-        return new DataSource( ContainerHelper::ContainerToSequence(aComplexCategories) );
+        return new DataSource( comphelper::containerToSequence(aComplexCategories) );
     }
 
     OSL_ASSERT( aRangeRepresentation == lcl_aCompleteRange );
@@ -772,7 +772,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
             aResultLSeqVec.push_back( *aIt );
     }
 
-    return new DataSource( ContainerHelper::ContainerToSequence(aResultLSeqVec) );
+    return new DataSource( comphelper::containerToSequence(aResultLSeqVec) );
 }
 
 Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments(
@@ -893,7 +893,7 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
             ? m_aInternalData.getComplexColumnLabel( nIndex )
             : m_aInternalData.getComplexRowLabel( nIndex );
         if( !aComplexLabel.empty() )
-            aResult = ContainerHelper::ContainerToSequence(aComplexLabel);
+            aResult = comphelper::containerToSequence(aComplexLabel);
     }
     else if( aRange.match( lcl_aCategoriesPointRangeNamePrefix ) )
     {
@@ -902,7 +902,7 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
             ? m_aInternalData.getComplexRowLabel( nPointIndex )
             : m_aInternalData.getComplexColumnLabel( nPointIndex );
         if( !aComplexCategory.empty() )
-            aResult = ContainerHelper::ContainerToSequence(aComplexCategory);
+            aResult = comphelper::containerToSequence(aComplexCategory);
     }
     else if( aRange.match( lcl_aCategoriesLevelRangeNamePrefix ) )
     {
@@ -1305,7 +1305,7 @@ Sequence< Sequence< Type > > lcl_convertVectorVectorToSequenceSequence( const ve
     {
         aRet.realloc(nOuterCount);
         for( sal_Int32 nN=0; nN<nOuterCount; nN++)
-            aRet[nN]= ContainerHelper::ContainerToSequence( rIn[nN] );
+            aRet[nN]= comphelper::containerToSequence( rIn[nN] );
     }
     return aRet;
 }
@@ -1332,7 +1332,7 @@ Sequence< Sequence< OUString > > lcl_convertComplexAnyVectorToStringSequence( co
     {
         aRet.realloc(nOuterCount);
         for( sal_Int32 nN=0; nN<nOuterCount; nN++)
-            aRet[nN]= lcl_AnyToStringSequence( ContainerHelper::ContainerToSequence( rIn[nN] ) );
+            aRet[nN]= lcl_AnyToStringSequence( comphelper::containerToSequence( rIn[nN] ) );
     }
     return aRet;
 }
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index a64d893e715b..4c00807cb175 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -22,6 +22,7 @@
 #include "ContainerHelper.hxx"
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/servicehelper.hxx>
+#include <comphelper/sequence.hxx>
 
 #include <vector>
 #include <algorithm>
@@ -111,7 +112,7 @@ Sequence< uno::Type > SAL_CALL
         aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XMultiPropertyStates ));
         aTypes.push_back( LCL_PROP_CPPUTYPE( XStyleSupplier ));
 
-        aTypeList = ::chart::ContainerHelper::ContainerToSequence( aTypes );
+        aTypeList = comphelper::containerToSequence( aTypes );
     }
 
     return aTypeList;
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 40a7e4312b99..654f30a84c24 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/chart2/XDataSeries.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
+#include <comphelper/sequence.hxx>
 
 #define PREFERED_DEFAULT_COLOR 0x0000ff
 
@@ -292,7 +293,7 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface
                             nPreferredColor,
                             sal_False ));
             }
-            m_aSelectedRanges = ContainerHelper::ContainerToSequence( aHilightedRanges );
+            m_aSelectedRanges = comphelper::containerToSequence( aHilightedRanges );
         }
     }
 }
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 6857be4bd386..dfafae4df28e 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -156,7 +156,7 @@ private:
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return comphelper::containerToSequence( aProperties );
     }
 };
 
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 35ca0c880ea6..5d3633c7de1d 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -152,7 +152,7 @@ private:
         ::std::sort( aProperties.begin(), aProperties.end(),
                      ::chart::PropertyNameLess() );
 
-        return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+        return comphelper::containerToSequence( aProperties );
     }
 
 };