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 /extensions | |
| 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 'extensions')
5 files changed, 8 insertions, 11 deletions
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index e1f261ad0c45..db9dec1e027b 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 cf2ad165959e..b800f886a330 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 7a8a026e891e..b3e544abfe97 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 3b690583fb25..0aebacd54f02 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 8293553a8b3c..c0ca257046b1 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& ) { |