diff options
| author | Noel Grandin <noel@peralex.com> | 2015-06-03 15:16:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-06-04 06:35:44 +0000 |
| commit | 81610561edfb8c899a062cc09fc1a80e8098577f (patch) | |
| tree | cdb746528f25a7d40c51be4b9cd324ceb55035b6 /chart2/source/model | |
| parent | a9a2375a744368415a7ea4c563c8e4776a6ec059 (diff) | |
uno::Sequence provides now begin and end
use begin() and end() when calling std::copy on an uno::Sequence
Inspired by commit b34b648fc3262c5d9aa295f621e8fe9c97d4c6b2
"uno::Sequence provides now begin and end"
Change-Id: I08e8c3fd6144e77b95a26f85bc0daf6a9edeeb0b
Reviewed-on: https://gerrit.libreoffice.org/16057
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'chart2/source/model')
3 files changed, 8 insertions, 8 deletions
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 0e57e62de90d..f42adadc51cd 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -854,8 +854,8 @@ void ChartTypeTemplate::createChartTypes( Sequence< Reference< XDataSeries > > aNewSeriesSeq( xDSCnt->getDataSeries()); sal_Int32 nNewStartIndex = aNewSeriesSeq.getLength(); aNewSeriesSeq.realloc( nNewStartIndex + aSeriesSeq[nSeriesIdx].getLength() ); - ::std::copy( aSeriesSeq[nSeriesIdx].getConstArray(), - aSeriesSeq[nSeriesIdx].getConstArray() + aSeriesSeq[nSeriesIdx].getLength(), + ::std::copy( aSeriesSeq[nSeriesIdx].begin(), + aSeriesSeq[nSeriesIdx].end(), aNewSeriesSeq.getArray() + nNewStartIndex ); xDSCnt->setDataSeries( aNewSeriesSeq ); } diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index e44a97ef010d..8e741fb6dee8 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -214,8 +214,8 @@ void ColumnLineChartTypeTemplate::createChartTypes( { Reference< XDataSeriesContainer > xDSCnt( xCT, uno::UNO_QUERY_THROW ); Sequence< Reference< XDataSeries > > aColumnSeq( nNumberOfColumns ); - ::std::copy( aFlatSeriesSeq.getConstArray(), - aFlatSeriesSeq.getConstArray() + nNumberOfColumns, + ::std::copy( aFlatSeriesSeq.begin(), + aFlatSeriesSeq.begin() + nNumberOfColumns, aColumnSeq.getArray()); xDSCnt->setDataSeries( aColumnSeq ); } @@ -230,8 +230,8 @@ void ColumnLineChartTypeTemplate::createChartTypes( { Reference< XDataSeriesContainer > xDSCnt( xCT, uno::UNO_QUERY_THROW ); Sequence< Reference< XDataSeries > > aLineSeq( nNumberOfLines ); - ::std::copy( aFlatSeriesSeq.getConstArray() + nNumberOfColumns, - aFlatSeriesSeq.getConstArray() + aFlatSeriesSeq.getLength(), + ::std::copy( aFlatSeriesSeq.begin() + nNumberOfColumns, + aFlatSeriesSeq.end(), aLineSeq.getArray()); xDSCnt->setDataSeries( aLineSeq ); } diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index 8202d8e5a796..aba77b13ca36 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -74,8 +74,8 @@ InterpretedData SAL_CALL ColumnLineDataInterpreter::interpretDataSource( Sequence< Reference< XDataSeries > > & rColumnDataSeries = aResult.Series[0]; Sequence< Reference< XDataSeries > > & rLineDataSeries = aResult.Series[1]; rLineDataSeries.realloc( nNumOfLines ); - ::std::copy( rColumnDataSeries.getConstArray() + nNumberOfSeries - nNumOfLines, - rColumnDataSeries.getConstArray() + nNumberOfSeries, + ::std::copy( rColumnDataSeries.begin() + nNumberOfSeries - nNumOfLines, + rColumnDataSeries.begin() + nNumberOfSeries, rLineDataSeries.getArray() ); rColumnDataSeries.realloc( nNumberOfSeries - nNumOfLines ); } |