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

Caolán McNamara caolanm at redhat.com
Tue Oct 18 13:06:21 UTC 2016


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

New commits:
commit 1a583283d6b58c8951cb52faac82ecb24fdbf1b3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 18 14:03:50 2016 +0100

    Revert "std::list<sal_uLong> to deque"
    
    stldebug assert on insert->table, ok, ctrl+a, ctrl+c, ctrl+v
    
    This reverts commit 9e9e7bd3c9dc9a3149436916e747c7f7ee040621.

diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index c199d6d..7a13fd3 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -45,7 +45,6 @@
 #include <redline.hxx>
 #include <fmtfsize.hxx>
 #include <list>
-#include <deque>
 #include <memory>
 #include <o3tl/make_unique.hxx>
 
@@ -69,7 +68,7 @@ namespace
 
     typedef std::vector< BoxSpanInfo > BoxStructure;
     typedef std::vector< BoxStructure > LineStructure;
-    typedef std::deque< sal_uLong > ColumnStructure;
+    typedef std::list< sal_uLong > ColumnStructure;
 
     struct SubBox
     {


More information about the Libreoffice-commits mailing list