[Libreoffice-commits] core.git: 2 commits - sw/source writerfilter/source

[Miklos Vajna]

 sw/source/filter/ww8/wrtw8esh.cxx                 |    2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   22 ++++++----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

New commits:
commit 3ded687bef4b72a9bb25ce8749c481809b9e04df
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Oct 13 21:45:57 2014 +0200

    SwBasicEscherEx::WritePictures: improve comment
    
    Change-Id: I6763d18efb2b61462b0a92f847495884716f18bb

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 1c5e838..a259e91 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2236,7 +2236,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
 
     for( ; i--; pSdrObjs = rWrt.pSdrObjs, pTxtBxs = rWrt.pTxtBxs )
     {
-        // "dummy char" (or any Count ?) - why? This knows only M$
+        // "dummy char" (or any Count ?) - why? Only Microsoft knows it.
         GetStream().WriteChar( i );
 
         OpenContainer( ESCHER_DgContainer );
commit 05874170fefb22ad1c461d5402ad30de2654453a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Oct 13 21:44:50 2014 +0200

    Use comphelper::SequenceAsVector
    
    Change-Id: I0af333551bdd32400b795d37de0d6240e68dd6b6

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f49a14f..8bdf7f7 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();
 }
 
 /*-------------------------------------------------------------------------