summaryrefslogtreecommitdiff
path: root/chart2/source
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 /chart2/source
parentf7b5f477bfd942e0a1d8880c372635000d724dd7 (diff)
use comphelper::containerToSequence
in chart2, we remove a local equivalent of the method Change-Id: I25129a3d1ea1dd724eb9cd38a57be37a78b3d100
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/GridWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx2
-rw-r--r--chart2/source/controller/dialogs/DialogModel.cxx7
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx3
-rw-r--r--chart2/source/inc/ContainerHelper.hxx19
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx5
-rw-r--r--chart2/source/model/main/Axis.cxx2
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx4
-rw-r--r--chart2/source/model/main/DataPoint.cxx2
-rw-r--r--chart2/source/model/main/DataSeries.cxx10
-rw-r--r--chart2/source/model/main/Diagram.cxx4
-rw-r--r--chart2/source/model/main/FormattedString.cxx2
-rw-r--r--chart2/source/model/main/GridProperties.cxx2
-rw-r--r--chart2/source/model/main/Legend.cxx2
-rw-r--r--chart2/source/model/main/PageBackground.cxx2
-rw-r--r--chart2/source/model/main/StockBar.cxx2
-rw-r--r--chart2/source/model/main/Title.cxx2
-rw-r--r--chart2/source/model/main/Wall.cxx2
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/BubbleChartType.cxx2
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/BubbleDataInterpreter.cxx4
-rw-r--r--chart2/source/model/template/CandleStickChartType.cxx6
-rw-r--r--chart2/source/model/template/ChartType.cxx2
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx2
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/ColumnChartType.cxx2
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/DataInterpreter.cxx4
-rw-r--r--chart2/source/model/template/LineChartType.cxx2
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/PieChartType.cxx2
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/ScatterChartType.cxx2
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.cxx4
-rw-r--r--chart2/source/model/template/XYDataInterpreter.cxx4
-rw-r--r--chart2/source/tools/AxisHelper.cxx5
-rw-r--r--chart2/source/tools/CharacterProperties.cxx3
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx3
-rw-r--r--chart2/source/tools/DataSeriesHelper.cxx4
-rw-r--r--chart2/source/tools/DataSourceHelper.cxx15
-rw-r--r--chart2/source/tools/DiagramHelper.cxx5
-rw-r--r--chart2/source/tools/ErrorBar.cxx2
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx12
-rw-r--r--chart2/source/tools/OPropertySet.cxx3
-rw-r--r--chart2/source/tools/RangeHighlighter.cxx3
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx2
-rw-r--r--chart2/source/tools/RegressionEquation.cxx2
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx3
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx3
61 files changed, 101 insertions, 110 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 80b551bbcaf9..42f5d7f11b2f 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -62,7 +62,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index a064752aae72..541c722bbfb4 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -389,7 +389,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 495e8dcd1d58..00611617d01b 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -257,7 +257,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index f48e6ef6b16e..c65defc69b7f 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -228,7 +228,7 @@ uno::Sequence< Property > lcl_GetPropertySequence( DataSeriesPointWrapper::eType
::std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
struct StaticSeriesWrapperPropertyArray_Initializer
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index e38aaba322d7..2ae296f4c5ce 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -478,7 +478,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 5e994e29798c..6ce104f45d76 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -64,7 +64,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 4b5b21f61a49..8b77142744a2 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -260,7 +260,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 7483e1429553..23d048f207ef 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/chart2/XChartType.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/drawing/LineJoint.hpp>
+#include <comphelper/sequence.hxx>
#include "LinePropertiesHelper.hxx"
#include "UserDefinedProperties.hxx"
@@ -82,7 +83,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 5fd664df52c8..f2c46f53095d 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -184,7 +184,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 4928e5dd31fa..9921af669504 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -26,6 +26,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/chart2/XChartType.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
+#include <comphelper/sequence.hxx>
#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
@@ -64,7 +65,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 7be9d4eeffc5..5ae15ce5fdd0 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -66,7 +66,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 4f356b9841c1..9e3d0ae25a10 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -39,6 +39,7 @@
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
+#include <comphelper/sequence.hxx>
#include <rtl/ustring.hxx>
@@ -343,7 +344,7 @@ Reference< XDataSeries > lcl_CreateNewSeries(
aNewSequences.push_back( ::chart::DataSourceHelper::createLabeledDataSequence( xSeq ));
}
- xSink->setData( ContainerToSequence( aNewSequences ));
+ xSink->setData( comphelper::containerToSequence( aNewSequences ));
}
}
@@ -506,7 +507,7 @@ void addNewSeriesToContainer(
++aIt;
aSeries.insert(aIt, xNewSeries);
- xSeriesCnt->setDataSeries(ContainerToSequence(aSeries));
+ xSeriesCnt->setDataSeries(comphelper::containerToSequence(aSeries));
}
}
@@ -735,7 +736,7 @@ bool DialogModel::setData(
applyInterpretedData(
xInterpreter->interpretDataSource(
xDataSource, rArguments,
- ContainerToSequence( aSeriesToReUse )),
+ comphelper::containerToSequence( aSeriesToReUse )),
aSeriesToReUse,
true /* bSetStyles */);
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index de804c436bab..807fe68fa874 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/Desktop.hpp>
+#include <comphelper/sequence.hxx>
namespace chart
{
@@ -146,7 +147,7 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx
aTypes.push_back( cppu::UnoType<frame::XTerminateListener>::get() );
aTypes.push_back( cppu::UnoType<ui::dialogs::XExecutableDialog>::get() );
aTypes.push_back( cppu::UnoType<beans::XPropertySet>::get() );
- aTypeList = ::chart::ContainerHelper::ContainerToSequence( aTypes );
+ aTypeList = comphelper::containerToSequence( aTypes );
}
return aTypeList;
diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx
index 7c7284acf888..9f01b47ab01b 100644
--- a/chart2/source/inc/ContainerHelper.hxx
+++ b/chart2/source/inc/ContainerHelper.hxx
@@ -32,25 +32,6 @@ namespace chart
namespace ContainerHelper
{
-/** converts a standard container into a sequence of the same type
-
- input: standard container
- output: css::uno::Sequence< container::value_type >
-
- example:
-
- ::std::vector< sal_Int32 > aVector;
- Sequence< sal_Int32 > aSequence( ContainerHelper::ContainerToSequence( aVector ));
- */
-template< class Container >
- ::com::sun::star::uno::Sequence< typename Container::value_type >
- ContainerToSequence( const Container & rCont )
-{
- ::com::sun::star::uno::Sequence< typename Container::value_type > aResult( rCont.size());
- ::std::copy( rCont.begin(), rCont.end(), aResult.getArray());
- return aResult;
-}
-
/** converts a UNO sequence into a standard "Sequence" container. For
convenience see the methods SequenceToVector, etc. below.
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 1e06b3d7500f..ba2746d2f1b1 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -28,6 +28,7 @@
#include <comphelper/propertysetinfo.hxx>
#include <comphelper/documentconstants.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include <comphelper/sequence.hxx>
#include <sot/storage.hxx>
#include <osl/diagnose.h>
@@ -117,7 +118,7 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage(
else
aStorageArgs[0] <<= aMDHelper.URL;
aStorageArgs[1] <<= (embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE);
- aStorageArgs[2] <<= ::chart::ContainerHelper::ContainerToSequence( aPropertiesForStorage );
+ aStorageArgs[2] <<= comphelper::containerToSequence( aPropertiesForStorage );
xStorage.set(
xStorageFact->createInstanceWithArguments( aStorageArgs ),
@@ -181,7 +182,7 @@ uno::Reference< embed::XStorage > lcl_getReadStorage(
Sequence< uno::Any > aStorageArgs( 3 );
aStorageArgs[0] <<= xStream;
aStorageArgs[1] <<= (embed::ElementModes::READ | embed::ElementModes::NOCREATE);
- aStorageArgs[2] <<= ::chart::ContainerHelper::ContainerToSequence( aPropertiesForStorage );
+ aStorageArgs[2] <<= comphelper::containerToSequence( aPropertiesForStorage );
xStorage.set(
xStorageFact->createInstanceWithArguments( aStorageArgs ), uno::UNO_QUERY_THROW );
}
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index b8040e7b5648..10334a6e92cc 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -286,7 +286,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index ee431a8fca6d..63dfa286a6e8 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -95,7 +95,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
@@ -298,7 +298,7 @@ void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XC
Sequence< Reference< chart2::XChartType > > SAL_CALL BaseCoordinateSystem::getChartTypes()
throw (uno::RuntimeException, std::exception)
{
- return ContainerHelper::ContainerToSequence( m_aChartTypes );
+ return comphelper::containerToSequence( m_aChartTypes );
}
void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< chart2::XChartType > >& aChartTypes )
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index c775c5ce8392..d3156a2cd3a6 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -61,7 +61,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 3cf89fa952d7..1a42a726646e 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -71,7 +71,7 @@ struct StaticDataSeriesInfoHelper : public rtl::StaticWithInit< ::cppu::OPropert
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
@@ -274,7 +274,7 @@ void SAL_CALL DataSeries::getFastPropertyValue
// special handling for get. set is not possible for this property
if( nHandle == DataSeriesProperties::PROP_DATASERIES_ATTRIBUTED_DATA_POINTS )
{
- // ToDo: only add those property sets that are really modified
+ // TODO: only add those property sets that are really modified
uno::Sequence< sal_Int32 > aSeq( m_aAttributedDataPoints.size());
sal_Int32 * pIndexArray = aSeq.getArray();
sal_Int32 i = 0;
@@ -331,7 +331,7 @@ Reference< beans::XPropertySet >
Sequence< Reference< chart2::data::XLabeledDataSequence > > aSequences;
{
MutexGuard aGuard( GetMutex() );
- aSequences = ContainerHelper::ContainerToSequence( m_aDataSequences );
+ aSequences = comphelper::containerToSequence( m_aDataSequences );
}
::std::vector< Reference< chart2::data::XLabeledDataSequence > > aValuesSeries(
@@ -440,7 +440,7 @@ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries:
throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetMutex() );
- return ContainerHelper::ContainerToSequence( m_aDataSequences );
+ return comphelper::containerToSequence( m_aDataSequences );
}
// ____ XRegressionCurveContainer ____
@@ -491,7 +491,7 @@ uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries:
throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetMutex() );
- return ContainerHelper::ContainerToSequence( m_aRegressionCurves );
+ return comphelper::containerToSequence( m_aRegressionCurves );
}
void SAL_CALL DataSeries::setRegressionCurves(
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 9f95cee79723..b0e5c0b04d2f 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -250,7 +250,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
@@ -561,7 +561,7 @@ uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > SAL_CALL Diagram::g
throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetMutex() );
- return ContainerHelper::ContainerToSequence( m_aCoordSystems );
+ return comphelper::containerToSequence( m_aCoordSystems );
}
void SAL_CALL Diagram::setCoordinateSystems(
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index f30eb31a4098..13b54ada3de7 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -73,7 +73,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index 5aa3f35301fe..7eb1350fd9e6 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -101,7 +101,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 9d22b6eb7ffb..1528dfc45968 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -157,7 +157,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index ab3ceb0b3935..295dd0a72d9f 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -86,7 +86,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index 0b05ee094fcc..347b83f11b37 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -60,7 +60,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 653abe45d1aa..20300b252d83 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -204,7 +204,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index ef1b9e38988b..80093ed21c72 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -88,7 +88,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 1537c3fd5fea..da3770de9d87 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -92,7 +92,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 190ed2344876..d18f8996a41e 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -100,7 +100,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 4b494b7943bc..b732c64d6ffa 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -70,7 +70,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index 0f4276d80bf3..9e4fcac4373d 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -72,7 +72,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index f9e4d258320f..2465041abc65 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -149,13 +149,13 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
OSL_ASSERT( xSeries.is() );
Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY );
OSL_ASSERT( xSink.is() );
- xSink->setData( ContainerHelper::ContainerToSequence( aNewData ) );
+ xSink->setData( comphelper::containerToSequence( aNewData ) );
aSeriesVec.push_back( xSeries );
}
Sequence< Sequence< Reference< XDataSeries > > > aSeries(1);
- aSeries[0] = ContainerHelper::ContainerToSequence( aSeriesVec );
+ aSeries[0] = comphelper::containerToSequence( aSeriesVec );
return InterpretedData( aSeries, xCategories );
}
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 1d46372591d6..e4125fbe36b0 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -123,7 +123,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
@@ -243,7 +243,7 @@ uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRo
aMandRoles.push_back( "values-last");
- return ContainerHelper::ContainerToSequence( aMandRoles );
+ return comphelper::containerToSequence( aMandRoles );
}
Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles()
@@ -265,7 +265,7 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles()
aOptRoles.push_back( "values-max");
}
- return ContainerHelper::ContainerToSequence( aOptRoles );
+ return comphelper::containerToSequence( aOptRoles );
}
OUString SAL_CALL CandleStickChartType::getRoleOfSequenceForSeriesLabel()
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 9ab9722615ad..bd6162828393 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -183,7 +183,7 @@ Sequence< Reference< chart2::XDataSeries > > SAL_CALL ChartType::getDataSeries()
{
SolarMutexGuard g;
- return ContainerHelper::ContainerToSequence( m_aDataSeries );
+ return comphelper::containerToSequence( m_aDataSeries );
}
void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XDataSeries > >& aDataSeries )
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index ad12cac7cffd..adee48ecad68 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -600,7 +600,7 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames()
}
}
- return ContainerHelper::ContainerToSequence( aServices );
+ return comphelper::containerToSequence( aServices );
}
// ____ XServiceInfo ____
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 2fb754bcba81..9076b8f073d5 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -274,7 +274,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData(
{
// interpret new data and re-use existing series
Sequence< Reference< XDataSeries > > aFlatSeriesSeq(
- ::chart::ContainerHelper::ContainerToSequence( DiagramHelper::getDataSeriesFromDiagram( xDiagram )));
+ comphelper::containerToSequence( DiagramHelper::getDataSeriesFromDiagram( xDiagram )));
const sal_Int32 nFormerSeriesCount = aFlatSeriesSeq.getLength();
Reference< chart2::XDataInterpreter > xInterpreter( getDataInterpreter());
chart2::InterpretedData aData =
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index f11b2a1b77a7..c60b08bcba83 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -98,7 +98,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 7f36308fd1ab..25f0cc1d51a9 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -97,7 +97,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 9cc8c8e66a4f..18487e884eb3 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -132,7 +132,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource(
}
Sequence< Sequence< Reference< XDataSeries > > > aSeries(1);
- aSeries[0] = ContainerToSequence( aSeriesVec );
+ aSeries[0] = comphelper::containerToSequence( aSeriesVec );
return InterpretedData( aSeries, xCategories );
}
@@ -308,7 +308,7 @@ Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData(
}
}
- return Reference< data::XDataSource >( DataSourceHelper::createDataSource( ContainerToSequence( aResultVec ) ) );
+ return Reference< data::XDataSource >( DataSourceHelper::createDataSource( comphelper::containerToSequence( aResultVec ) ) );
}
// convenience methods
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index 553dce43169b..3c9e8ac85a1c 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -111,7 +111,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 42441a7f83ee..8c6175119699 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -116,7 +116,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 2a6ebf659e0a..f036ebc312ad 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -99,7 +99,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 3385df70a3c5..6fc096aef638 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -125,7 +125,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 106f88f67a07..83e23e3e482e 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -115,7 +115,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 35f974de2f02..1c675c903bde 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -118,7 +118,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index 0e28bf73b4d0..88a51fc115c4 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -127,7 +127,7 @@ private:
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- return ::chart::ContainerHelper::ContainerToSequence( aProperties );
+ return comphelper::containerToSequence( aProperties );
}
};
@@ -394,7 +394,7 @@ void StockChartTypeTemplate::createChartTypes(
}
Reference< XChartTypeContainer > xCTCnt( rCoordSys[ 0 ], uno::UNO_QUERY_THROW );
- xCTCnt->setChartTypes( ::chart::ContainerHelper::ContainerToSequence(aChartTypeVec) );
+ xCTCnt->setChartTypes( comphelper::containerToSequence(aChartTypeVec) );
}
catch( const uno::Exception & ex )
{
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index 33175a41e9ef..a30a4459e4fa 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -133,13 +133,13 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
OSL_ASSERT( xSeries.is() );
Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY );
OSL_ASSERT( xSink.is() );
- xSink->setData( ContainerHelper::ContainerToSequence( aNewData ) );
+ xSink->setData( comphelper::containerToSequence( aNewData ) );
aSeriesVec.push_back( xSeries );
}
Sequence< Sequence< Reference< XDataSeries > > > aSeries(1);
- aSeries[0] = ContainerHelper::ContainerToSequence( aSeriesVec );
+ aSeries[0] = comphelper::containerToSequence( aSeriesVec );
return InterpretedData( aSeries, xCategories );
}
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 );
}
};
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 5a16b8034419..fc03e33e17f3 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -38,6 +38,7 @@
#include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
+#include <comphelper/sequence.hxx>
#include <rtl/math.hxx>
@@ -218,7 +219,7 @@ Sequence< Reference< beans::XPropertySet > > VCoordinateSystem::getGridListFromA
aRet.insert( aRet.end(), aSubGrids.begin(), aSubGrids.end() );
}
- return ContainerHelper::ContainerToSequence( aRet );
+ return comphelper::containerToSequence( aRet );
}
void VCoordinateSystem::impl_adjustDimension( sal_Int32& rDimensionIndex )
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 164d2fd51629..4ed9bdcd5a28 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -78,6 +78,7 @@
#include <com/sun/star/drawing/TextFitToSizeType.hpp>
#include <svx/unoshape.hxx>
+#include <comphelper/sequence.hxx>
#include <functional>
#include <map>
@@ -2063,7 +2064,7 @@ uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const
}
}
}
- return ContainerHelper::ContainerToSequence( aRetVector );
+ return comphelper::containerToSequence( aRetVector );
}
namespace