[Libreoffice-commits] core.git: basctl/source basegfx/source chart2/source comphelper/source dbaccess/source extensions/source framework/source include/comphelper svx/source toolkit/source xmloff/source
Noel Grandin
noel at peralex.com
Wed Jun 3 23:36:08 PDT 2015
basctl/source/basicide/scriptdocument.cxx | 2 +-
basegfx/source/tools/keystoplerp.cxx | 4 +---
chart2/source/controller/dialogs/DialogModel.cxx | 2 +-
chart2/source/inc/ContainerHelper.hxx | 5 ++---
chart2/source/model/template/ChartTypeTemplate.cxx | 4 ++--
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 8 ++++----
chart2/source/model/template/ColumnLineDataInterpreter.cxx | 4 ++--
chart2/source/tools/DataSeriesHelper.cxx | 2 +-
chart2/source/tools/DataSourceHelper.cxx | 4 ++--
chart2/source/tools/DiagramHelper.cxx | 7 +++----
comphelper/source/container/embeddedobjectcontainer.cxx | 2 +-
dbaccess/source/core/dataaccess/connection.cxx | 2 +-
extensions/source/propctrlr/eformshelper.cxx | 6 ++----
extensions/source/propctrlr/eventhandler.cxx | 4 ++--
extensions/source/propctrlr/formcomponenthandler.cxx | 3 +--
extensions/source/propctrlr/propertycomposer.cxx | 4 ++--
extensions/source/propctrlr/xsdvalidationhelper.cxx | 2 +-
framework/source/services/autorecovery.cxx | 2 +-
framework/source/uiconfiguration/imagemanagerimpl.cxx | 3 +--
include/comphelper/sequence.hxx | 6 +++---
svx/source/form/formcontroller.cxx | 2 +-
toolkit/source/helper/formpdfexport.cxx | 4 ++--
xmloff/source/chart/SchXMLExport.cxx | 6 +++---
xmloff/source/chart/SchXMLSeriesHelper.cxx | 2 +-
xmloff/source/chart/SchXMLTableContext.cxx | 3 +--
25 files changed, 42 insertions(+), 51 deletions(-)
New commits:
commit 81610561edfb8c899a062cc09fc1a80e8098577f
Author: Noel Grandin <noel at peralex.com>
Date: Wed Jun 3 15:16:19 2015 +0200
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 at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index b318aa9..7fdb066 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -1277,7 +1277,7 @@ namespace basctl
Sequence< OUString > aUsedNames( getObjectNames( _eType, _rLibName ) );
::std::set< OUString > aUsedNamesCheck;
- ::std::copy( aUsedNames.getConstArray(), aUsedNames.getConstArray() + aUsedNames.getLength(),
+ ::std::copy( aUsedNames.begin(), aUsedNames.end(),
::std::insert_iterator< ::std::set< OUString > >( aUsedNamesCheck, aUsedNamesCheck.begin() ) );
bool bValid = false;
diff --git a/basegfx/source/tools/keystoplerp.cxx b/basegfx/source/tools/keystoplerp.cxx
index 14a0312..9dfd625 100644
--- a/basegfx/source/tools/keystoplerp.cxx
+++ b/basegfx/source/tools/keystoplerp.cxx
@@ -54,9 +54,7 @@ namespace basegfx
maKeyStops(rKeyStops.getLength()),
mnLastIndex(0)
{
- std::copy( rKeyStops.getConstArray(),
- rKeyStops.getConstArray()+rKeyStops.getLength(),
- maKeyStops.begin() );
+ std::copy( rKeyStops.begin(), rKeyStops.end(), maKeyStops.begin() );
validateInput(maKeyStops);
}
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index f8ea3f7..6127ee9 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -522,7 +522,7 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
{
Reference< data::XDataSource > xSource( xSeries, uno::UNO_QUERY_THROW );
const Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSource->getDataSequences());
- ::std::copy( aSeq.getConstArray(), aSeq.getConstArray() + aSeq.getLength(),
+ ::std::copy( aSeq.begin(), aSeq.end(),
lcl_RolesWithRangeAppend( &aResult, aRoleOfSequenceForLabel ));
if( xChartType.is())
{
diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx
index 139ddd6..d6eee1a 100644
--- a/chart2/source/inc/ContainerHelper.hxx
+++ b/chart2/source/inc/ContainerHelper.hxx
@@ -69,8 +69,7 @@ template< class Container >
SequenceToSTLSequenceContainer( const ::com::sun::star::uno::Sequence< typename Container::value_type > & rSeq )
{
Container aResult( rSeq.getLength());
- ::std::copy( rSeq.getConstArray(), rSeq.getConstArray() + rSeq.getLength(),
- aResult.begin() );
+ ::std::copy( rSeq.begin(), rSeq.end(), aResult.begin() );
return aResult;
}
@@ -95,7 +94,7 @@ template< class Container >
SequenceToSTLContainer( const ::com::sun::star::uno::Sequence< typename Container::value_type > & rSeq )
{
Container aResult;
- ::std::copy( rSeq.getConstArray(), rSeq.getConstArray() + rSeq.getLength(),
+ ::std::copy( rSeq.begin(), rSeq.end(),
::std::inserter< Container >( aResult, aResult.begin()));
return aResult;
}
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 0e57e62..f42adad 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 e44a97e..8e741fb 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 8202d8e..aba77b1 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 );
}
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 44debef..4329161 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -248,7 +248,7 @@ getAllDataSequences( const uno::Sequence<uno::Reference<chart2::XDataSeries> >&
if( xSource.is())
{
Sequence< Reference< chart2::data::XLabeledDataSequence > > aSeq( xSource->getDataSequences());
- ::std::copy( aSeq.getConstArray(), aSeq.getConstArray() + aSeq.getLength(),
+ ::std::copy( aSeq.begin(), aSeq.end(),
::std::back_inserter( aSeqVec ));
}
}
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index fea6268..0afe27e 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -320,7 +320,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
if( !xDataSource.is() )
continue;
uno::Sequence< uno::Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() );
- ::std::copy( aDataSequences.getConstArray(), aDataSequences.getConstArray() + aDataSequences.getLength(),
+ ::std::copy( aDataSequences.begin(), aDataSequences.end(),
::std::back_inserter( aResult ));
}
@@ -346,7 +346,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
if( !xDataSource.is() )
continue;
uno::Sequence< uno::Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() );
- ::std::copy( aDataSequences.getConstArray(), aDataSequences.getConstArray() + aDataSequences.getLength(),
+ ::std::copy( aDataSequences.begin(), aDataSequences.end(),
::std::back_inserter( aResult ));
}
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 82dca03..8023956 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -714,7 +714,7 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
{
Reference< XDataSeriesContainer > xDSCnt( aChartTypeSeq[j], uno::UNO_QUERY_THROW );
Sequence< Reference< XDataSeries > > aSeriesSeq( xDSCnt->getDataSeries() );
- ::std::copy( aSeriesSeq.getConstArray(), aSeriesSeq.getConstArray() + aSeriesSeq.getLength(),
+ ::std::copy( aSeriesSeq.begin(), aSeriesSeq.end(),
::std::back_inserter( aResult ));
}
}
@@ -1226,9 +1226,8 @@ Sequence< Reference< XChartType > >
{
Reference< XChartTypeContainer > xCTCnt( aCooSysSeq[i], uno::UNO_QUERY_THROW );
Sequence< Reference< XChartType > > aChartTypeSeq( xCTCnt->getChartTypes());
- ::std::copy( aChartTypeSeq.getConstArray(),
- aChartTypeSeq.getConstArray() + aChartTypeSeq.getLength(),
- ::std::back_inserter( aResult ));
+ ::std::copy( aChartTypeSeq.begin(), aChartTypeSeq.end(),
+ ::std::back_inserter( aResult ));
}
}
catch( const uno::Exception & ex )
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 10a7551..3fa1538 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -388,7 +388,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde
uno::Sequence< beans::PropertyValue > aObjDescr( rArgs.getLength() + 1 );
aObjDescr[0].Name = "Parent";
aObjDescr[0].Value <<= pImpl->m_xModel.get();
- ::std::copy( rArgs.getConstArray(), rArgs.getConstArray() + rArgs.getLength(), aObjDescr.getArray() + 1 );
+ ::std::copy( rArgs.begin(), rArgs.end(), aObjDescr.getArray() + 1 );
xObj = uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew(
rClassId, OUString(), pImpl->mxStorage, rNewName,
aObjDescr ), uno::UNO_QUERY );
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 070af92..417144d 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -391,7 +391,7 @@ namespace
void lcl_copyTypes( TypeBag& _out_rTypes, const Sequence< Type >& _rTypes )
{
- ::std::copy( _rTypes.getConstArray(), _rTypes.getConstArray() + _rTypes.getLength(),
+ ::std::copy( _rTypes.begin(), _rTypes.end(),
::std::insert_iterator< TypeBag >( _out_rTypes, _out_rTypes.begin() ) );
}
}
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index e1f261a..db9dec1 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -308,9 +308,7 @@ namespace pcr
{
Sequence< OUString > aModelNames = xForms->getElementNames();
_rModelNames.resize( aModelNames.getLength() );
- ::std::copy( aModelNames.getConstArray(), aModelNames.getConstArray() + aModelNames.getLength(),
- _rModelNames.begin()
- );
+ ::std::copy( aModelNames.begin(), aModelNames.end(), _rModelNames.begin() );
}
}
catch( const Exception& )
@@ -335,7 +333,7 @@ namespace pcr
{
Sequence< OUString > aNames = xBindings->getElementNames();
_rBindingNames.resize( aNames.getLength() );
- ::std::copy( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), _rBindingNames.begin() );
+ ::std::copy( aNames.begin(), aNames.end(), _rBindingNames.begin() );
}
}
}
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index cf2ad16..b800f88 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -304,8 +304,8 @@ namespace pcr
Sequence< Type > aListeners( xIntrospectionAccess->getSupportedListeners() );
- ::std::copy( aListeners.getConstArray(), aListeners.getConstArray() + aListeners.getLength(),
- ::std::insert_iterator< TypeBag >( _out_rTypes, _out_rTypes.begin() ) );
+ ::std::copy( aListeners.begin(), aListeners.end(),
+ ::std::insert_iterator< TypeBag >( _out_rTypes, _out_rTypes.begin() ) );
}
bool operator ==( const ScriptEventDescriptor& _lhs, const ScriptEventDescriptor& _rhs )
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 7a8a026..b3e544a 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1365,8 +1365,7 @@ namespace pcr
Reference< XDatabaseContext > xDatabaseContext = sdb::DatabaseContext::create( m_xContext );
Sequence< OUString > aDatasources = xDatabaseContext->getElementNames();
aListEntries.resize( aDatasources.getLength() );
- ::std::copy( aDatasources.getConstArray(), aDatasources.getConstArray() + aDatasources.getLength(),
- aListEntries.begin() );
+ ::std::copy( aDatasources.begin(), aDatasources.end(), aListEntries.begin() );
aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl(
_rxControlFactory, aListEntries, false, true );
}
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index 3b69058..0aebacd 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -59,8 +59,8 @@ namespace pcr
template < class BagType >
void putIntoBag( const Sequence< typename BagType::value_type >& _rArray, BagType& /* [out] */ _rBag )
{
- ::std::copy( _rArray.getConstArray(), _rArray.getConstArray() + _rArray.getLength(),
- ::std::insert_iterator< BagType >( _rBag, _rBag.begin() ) );
+ ::std::copy( _rArray.begin(), _rArray.end(),
+ ::std::insert_iterator< BagType >( _rBag, _rBag.begin() ) );
}
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 8293553a..c0ca257 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -86,7 +86,7 @@ namespace pcr
aElements = xRepository->getElementNames();
_rNames.resize( aElements.getLength() );
- ::std::copy( aElements.getConstArray(), aElements.getConstArray() + aElements.getLength(), _rNames.begin() );
+ ::std::copy( aElements.begin(), aElements.end(), _rNames.begin() );
}
catch( const Exception& )
{
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 8b75271..8f98232 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -3449,7 +3449,7 @@ void AutoRecovery::implts_openOneDoc(const OUString& sURL ,
// re-create all the views
::std::vector< OUString > aViewsToRestore( rInfo.ViewNames.getLength() );
if ( rInfo.ViewNames.getLength() )
- ::std::copy( rInfo.ViewNames.getConstArray(), rInfo.ViewNames.getConstArray() + rInfo.ViewNames.getLength(), aViewsToRestore.begin() );
+ ::std::copy( rInfo.ViewNames.begin(), rInfo.ViewNames.end(), aViewsToRestore.begin() );
// if we don't have views for whatever reason, then create a default-view, at least
if ( aViewsToRestore.empty() )
aViewsToRestore.push_back( OUString() );
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 1e4f97d..91ceb5c 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -208,8 +208,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
m_aImageCommandNameVector.resize(aCmdImageSeq.getLength() );
m_aImageNameVector.resize( aCmdImageSeq.getLength() );
- ::std::copy( aCmdImageSeq.getConstArray(),
- aCmdImageSeq.getConstArray()+aCmdImageSeq.getLength(),
+ ::std::copy( aCmdImageSeq.begin(), aCmdImageSeq.end(),
m_aImageCommandNameVector.begin() );
// Create a image name vector that must be provided to the vcl imagelist. We also need
diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index fcaab6b..03b7fea 100644
--- a/include/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
@@ -256,7 +256,7 @@ namespace comphelper
template < typename DstType, typename SrcType >
inline DstType* sequenceToArray( DstType* io_pArray, const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence )
{
- ::std::copy( i_Sequence.getConstArray(), i_Sequence.getConstArray()+i_Sequence.getLength(), io_pArray );
+ ::std::copy( i_Sequence.begin(), i_Sequence.end(), io_pArray );
return io_pArray;
}
@@ -327,7 +327,7 @@ namespace comphelper
inline DstType sequenceToContainer( const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence )
{
DstType result( i_Sequence.getLength() );
- ::std::copy( i_Sequence.getConstArray(), i_Sequence.getConstArray()+i_Sequence.getLength(), result.begin() );
+ ::std::copy( i_Sequence.begin(), i_Sequence.end(), result.begin() );
return result;
}
@@ -365,7 +365,7 @@ namespace comphelper
inline DstType& sequenceToContainer( DstType& o_Output, const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence )
{
o_Output.resize( i_Sequence.getLength() );
- ::std::copy( i_Sequence.getConstArray(), i_Sequence.getConstArray()+i_Sequence.getLength(), o_Output.begin() );
+ ::std::copy( i_Sequence.begin(), i_Sequence.end(), o_Output.begin() );
return o_Output;
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index e3e1127..f020904 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -4042,7 +4042,7 @@ void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >&
{
::osl::MutexGuard aGuard( m_aMutex );
// for now, just copy the ids of the features, because ....
- ::std::copy( _Features.getConstArray(), _Features.getConstArray() + _Features.getLength(),
+ ::std::copy( _Features.begin(), _Features.end(),
::std::insert_iterator< ::std::set< sal_Int16 > >( m_aInvalidFeatures, m_aInvalidFeatures.begin() )
);
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index e498fb0..acc0307 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -246,8 +246,8 @@ namespace toolkitform
static const char FM_PROP_STRINGITEMLIST[] = "StringItemList";
Sequence< OUString > aListEntries;
OSL_VERIFY( _rxModel->getPropertyValue( FM_PROP_STRINGITEMLIST ) >>= aListEntries );
- ::std::copy( aListEntries.getConstArray(), aListEntries.getConstArray() + aListEntries.getLength(),
- ::std::back_insert_iterator< ::std::vector< OUString > >( _rVector ) );
+ ::std::copy( aListEntries.begin(), aListEntries.end(),
+ ::std::back_insert_iterator< ::std::vector< OUString > >( _rVector ) );
}
}
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 07a8372..131a368 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -308,7 +308,7 @@ template< typename T >
void lcl_SequenceToVectorAppend( const Sequence< T > & rSource, ::std::vector< T > & rDestination )
{
rDestination.reserve( rDestination.size() + rSource.getLength());
- ::std::copy( rSource.getConstArray(), rSource.getConstArray() + rSource.getLength(),
+ ::std::copy( rSource.begin(), rSource.end(),
::std::back_inserter( rDestination ));
}
@@ -664,8 +664,8 @@ uno::Sequence< OUString > lcl_DataSequenceToStringSequence(
}
}
- ::std::copy( aValuesSequence.getConstArray(), aValuesSequence.getConstArray() + aValuesSequence.getLength(),
- ::std::back_inserter( aResult ));
+ ::std::copy( aValuesSequence.begin(), aValuesSequence.end(),
+ ::std::back_inserter( aResult ));
return aResult;
}
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index 3666e01..610a69a 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -54,7 +54,7 @@ using ::com::sun::star::uno::Sequence;
{
Reference< chart2::XDataSeriesContainer > xDSCnt( aChartTypeSeq[j], uno::UNO_QUERY_THROW );
Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xDSCnt->getDataSeries() );
- ::std::copy( aSeriesSeq.getConstArray(), aSeriesSeq.getConstArray() + aSeriesSeq.getLength(),
+ ::std::copy( aSeriesSeq.begin(), aSeriesSeq.end(),
::std::back_inserter( aResult ));
}
}
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index d129944..4f460f9 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -205,8 +205,7 @@ template< typename T >
::std::vector< T > lcl_SequenceToVector( const uno::Sequence< T > & rSequence )
{
::std::vector< T > aResult( rSequence.getLength());
- ::std::copy( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(),
- aResult.begin());
+ ::std::copy( rSequence.begin(), rSequence.end(), aResult.begin());
return aResult;
}
More information about the Libreoffice-commits
mailing list