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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/imagemanagerimpl.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 8b75271afbac..8f982328afae 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 1e4f97d48a12..91ceb5c67a60 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 |