diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-13 21:44:50 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-13 21:53:48 +0200 |
commit | 05874170fefb22ad1c461d5402ad30de2654453a (patch) | |
tree | 43e2026162ca9214f00a16f33c25522ce5f1f713 /writerfilter | |
parent | 1175b25bf2353c95111fb5c0459feee751b3c764 (diff) |
Use comphelper::SequenceAsVector
Change-Id: I0af333551bdd32400b795d37de0d6240e68dd6b6
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index f49a14f3a2b8..8bdf7f74aa6f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -589,25 +589,15 @@ void DomainMapper_Impl::IncorporateTabStop( const DeletableTabStop & rTabStop ) uno::Sequence< style::TabStop > DomainMapper_Impl::GetCurrentTabStopAndClear() { - uno::Sequence< style::TabStop > aRet( sal_Int32( m_aCurrentTabStops.size() ) ); - style::TabStop* pArray = aRet.getArray(); - ::std::vector<DeletableTabStop>::const_iterator aIt = m_aCurrentTabStops.begin(); - ::std::vector<DeletableTabStop>::const_iterator aEndIt = m_aCurrentTabStops.end(); - sal_Int32 nDeleted = 0; - for(sal_Int32 nIndex = 0; aIt != aEndIt; ++aIt) - { - if(!aIt->bDeleted) - pArray[nIndex++] = *aIt; - else - ++nDeleted; + comphelper::SequenceAsVector<style::TabStop> aRet; + for (DeletableTabStop& rStop : m_aCurrentTabStops) + { + if (!rStop.bDeleted) + aRet.push_back(rStop); } m_aCurrentTabStops.clear(); m_nCurrentTabStopIndex = 0; - if(nDeleted) - { - aRet.realloc( aRet.getLength() - nDeleted); - } - return aRet; + return aRet.getAsConstList(); } /*------------------------------------------------------------------------- |