summaryrefslogtreecommitdiff
path: root/svx/source/form
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/form')
-rw-r--r--svx/source/form/fmshimp.cxx7
-rw-r--r--svx/source/form/formcontroller.cxx4
-rw-r--r--svx/source/form/formcontrolling.cxx3
3 files changed, 3 insertions, 11 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 3ffa410e8fc6..1b4c497ec65e 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -808,12 +808,7 @@ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatu
if ( m_pShell->GetViewShell() && m_pShell->GetViewShell()->GetViewFrame() )
{
// unfortunately, SFX requires sal_uInt16
- ::std::vector< sal_uInt16 > aSlotIds;
- aSlotIds.reserve( _rFeatures.size() );
- ::std::copy( _rFeatures.begin(),
- _rFeatures.end(),
- ::std::insert_iterator< ::std::vector< sal_uInt16 > >( aSlotIds, aSlotIds.begin() )
- );
+ ::std::vector< sal_uInt16 > aSlotIds( _rFeatures.begin(), _rFeatures.end() );
// furthermore, SFX wants a terminating 0
aSlotIds.push_back( 0 );
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index be6e956cc478..a292f702f8ff 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3984,9 +3984,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.begin(), Features.end(),
- ::std::insert_iterator< ::std::set< sal_Int16 > >( m_aInvalidFeatures, m_aInvalidFeatures.begin() )
- );
+ m_aInvalidFeatures.insert( Features.begin(), Features.end() );
// ... we will do the real invalidation asynchronously
if ( !m_aFeatureInvalidationTimer.IsActive() )
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 7fffd84617da..c18a0f6c373b 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -424,8 +424,7 @@ namespace svx
SID_FM_VIEW_AS_GRID
};
sal_Int32 nFeatureCount = SAL_N_ELEMENTS( pSupportedFeatures );
- aSupportedFeatures.resize( nFeatureCount );
- ::std::copy( pSupportedFeatures, pSupportedFeatures + nFeatureCount, aSupportedFeatures.begin() );
+ aSupportedFeatures.insert( aSupportedFeatures.begin(), pSupportedFeatures, pSupportedFeatures + nFeatureCount );
m_pInvalidationCallback->invalidateFeatures( aSupportedFeatures );
}