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

[Julien Nabet]

 sw/source/core/doc/doccomp.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 102acb3675fed4e4e61a98722e279b9d8bc18ad2
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Nov 12 22:52:35 2017 +0100

    Replace list by vector vRedlines (sw)
    
    Change-Id: I4c5ca9dc59a08343fdbd2c2237f8346572f26011
    Reviewed-on: https://gerrit.libreoffice.org/44659
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 52f9c86a4e62..c9c7d58a0c3d 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -45,7 +45,6 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
 #include <cstddef>
-#include <list>
 #include <memory>
 #include <vector>
 
@@ -2077,7 +2076,7 @@ long SwDoc::MergeDoc( const SwDoc& rDoc )
         // we want to get all redlines from the SourceDoc
 
         // look for all insert redlines from the SourceDoc and determine their position in the DestDoc
-        std::list<SaveMergeRedline> vRedlines;
+        std::vector<SaveMergeRedline> vRedlines;
         const SwRedlineTable& rSrcRedlTable = rSrcDoc.getIDocumentRedlineAccess().GetRedlineTable();
         sal_uLong nEndOfExtra = rSrcDoc.GetNodes().GetEndOfExtras().GetIndex();
         sal_uLong nMyEndOfExtra = GetNodes().GetEndOfExtras().GetIndex();