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

Julien Nabet serval2412 at yahoo.fr
Sun Dec 3 21:22:24 UTC 2017


 sw/source/core/doc/doclay.cxx |    4 ++--
 sw/source/core/doc/tblcpy.cxx |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 21d45e8b6186a0a9978aa6904b7eff221ac7abf0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Dec 3 17:55:46 2017 +0100

    Replace some lists by vectors in sw/doc part
    
    Change-Id: If0ff7d8790824eae5701cca208761d3ee707eb58
    Reviewed-on: https://gerrit.libreoffice.org/45747
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 641bfb282c0e..8b18199fff7a 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1530,7 +1530,7 @@ bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
     {
         // get up by using the Anchor
 #if OSL_DEBUG_LEVEL > 0
-        std::list<const SwFrameFormat*> checkFormats;
+        std::vector<const SwFrameFormat*> checkFormats;
         for( auto pFormat : *GetSpzFrameFormats() )
         {
             const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
@@ -1547,7 +1547,7 @@ bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
             if( pIdx && pFlyNd == &pIdx->GetNode() )
             {
 #if OSL_DEBUG_LEVEL > 0
-                std::list<const SwFrameFormat*>::iterator checkPos = std::find(
+                auto checkPos = std::find(
                         checkFormats.begin(), checkFormats.end(), pFormat );
                 assert( checkPos != checkFormats.end());
                 checkFormats.erase( checkPos );
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 802dfff9f75f..36616cd5856f 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -44,7 +44,6 @@
 #include <UndoTable.hxx>
 #include <redline.hxx>
 #include <fmtfsize.hxx>
-#include <list>
 #include <deque>
 #include <memory>
 #include <o3tl/make_unique.hxx>
@@ -77,8 +76,8 @@ namespace
         bool mbCovered;
     };
 
-    typedef std::list< SubBox > SubLine;
-    typedef std::list< SubLine > SubTable;
+    typedef std::vector< SubBox > SubLine;
+    typedef std::vector< SubLine > SubTable;
 
     class TableStructure
     {


More information about the Libreoffice-commits mailing list