diff options
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 3 | ||||
-rw-r--r-- | sd/source/core/EffectMigration.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/framework/configuration/ResourceId.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/ToolBarManager.cxx | 5 |
5 files changed, 7 insertions, 9 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index d6567fc9f38d..ca84ab88285a 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -2818,8 +2818,7 @@ void EffectSequenceHelper::setTextReverse( const CustomAnimationTextGroupPtr& pT } else { - std::vector< CustomAnimationEffectPtr > aSortedVector(pTextGroup->maEffects.size()); - std::copy( pTextGroup->maEffects.begin(), pTextGroup->maEffects.end(), aSortedVector.begin() ); + std::vector< CustomAnimationEffectPtr > aSortedVector( pTextGroup->maEffects.begin(), pTextGroup->maEffects.end() ); ImplStlTextGroupSortHelper aSortHelper( bTextReverse ); std::sort( aSortedVector.begin(), aSortedVector.end(), aSortHelper ); diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 9a21767141c0..e5ed520d9895 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -1143,7 +1143,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos if( nNewPos == static_cast<sal_Int32>(aEffectVector.size()) ) { - std::copy(aEffects.begin(), aEffects.end(), std::back_inserter(rSequence)); + rSequence.insert( rSequence.end(), aEffects.begin(), aEffects.end() ); } else { diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 45e44c0d8628..0b81244ff811 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2220,8 +2220,8 @@ sal_Int32 CustomAnimationPane::fillAnimationLB( bool bHasText ) int nPos = mxLBAnimation->n_children(); - std::vector< CustomAnimationPresetPtr > aSortedVector(pCategory->maEffects.size()); - std::copy( pCategory->maEffects.begin(), pCategory->maEffects.end(), aSortedVector.begin() ); + std::vector< CustomAnimationPresetPtr > aSortedVector = + pCategory->maEffects; for( CustomAnimationPresetPtr& pDescriptor : aSortedVector ) { diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index bcc351b4a1b3..e851e2a260dc 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -373,7 +373,7 @@ void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments) { maResourceURLs.push_back(xAnchor->getResourceURL()); Sequence<OUString> aAnchorURLs (xAnchor->getAnchorURLs()); - std::copy(aAnchorURLs.begin(), aAnchorURLs.end(), std::back_inserter(maResourceURLs)); + maResourceURLs.insert( maResourceURLs.end(), aAnchorURLs.begin(), aAnchorURLs.end() ); } } } diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index b8ea8b70bfcb..e540c2cc83a7 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -1245,10 +1245,9 @@ void ToolBarList::MakeRequestedToolBarList (std::vector<OUString>& rRequestedToo { Groups::const_iterator iGroup (maGroups.find(eGroup)); if (iGroup != maGroups.end()) - ::std::copy( + rRequestedToolBars.insert( rRequestedToolBars.end(), iGroup->second.begin(), - iGroup->second.end(), - ::std::inserter(rRequestedToolBars,rRequestedToolBars.end())); + iGroup->second.end() ); } } |