diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-10-31 13:14:57 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2016-11-21 20:28:24 +0000 |
| commit | f0fa43ea99ac7564f2cc7ca1d997831808056b68 (patch) | |
| tree | f47df5bcac1834c22b1c45c5074e6f7f020d3611 /sw/source | |
| parent | 4c62de279a6783236a5e0811d0733e107c127fe3 (diff) | |
Revert "Revert "std::list<sal_uLong> to deque""
+ use returned iterator by insert method call
This reverts commit 1a583283d6b58c8951cb52faac82ecb24fdbf1b3.
Change-Id: I02547663230fb7b5959df349c4d395bbadd74c3b
Reviewed-on: https://gerrit.libreoffice.org/30439
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/doc/tblcpy.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index 7a13fd33205c..b5bc61c1bb21 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -45,6 +45,7 @@ #include <redline.hxx> #include <fmtfsize.hxx> #include <list> +#include <deque> #include <memory> #include <o3tl/make_unique.hxx> @@ -68,7 +69,7 @@ namespace typedef std::vector< BoxSpanInfo > BoxStructure; typedef std::vector< BoxStructure > LineStructure; - typedef std::list< sal_uLong > ColumnStructure; + typedef std::deque< sal_uLong > ColumnStructure; struct SubBox { @@ -334,7 +335,7 @@ namespace } if( rpCol == maCols.end() || *rpCol > rnBorder ) { - maCols.insert( rpCol, rnBorder ); + rpCol = maCols.insert( rpCol, rnBorder ); --rpCol; incColSpan( nLine, rnCol ); } |