mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "std::list<sal_uLong> to deque""

Browse Source 
+ use returned iterator by insert method call
This reverts commit 1a583283d6.

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>
This commit is contained in:
Julien Nabet
2016-10-31 13:14:57 +01:00
parent 4c62de279a
commit f0fa43ea99
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sw/source/core/doc/tblcpy.cxx
View File

@@ -45,6 +45,7 @@
#include <redline.hxx> #include <redline.hxx>
#include <fmtfsize.hxx> #include <fmtfsize.hxx>
#include <list> #include <list>
#include <deque>
#include <memory> #include <memory>
#include <o3tl/make_unique.hxx> #include <o3tl/make_unique.hxx>
@@ -68,7 +69,7 @@ namespace
typedef std::vector< BoxSpanInfo > BoxStructure; typedef std::vector< BoxSpanInfo > BoxStructure;
typedef std::vector< BoxStructure > LineStructure; typedef std::vector< BoxStructure > LineStructure;
typedef std::list< sal_uLong > ColumnStructure; typedef std::deque< sal_uLong > ColumnStructure;
struct SubBox struct SubBox
{ {
@@ -334,7 +335,7 @@ namespace
} }
if( rpCol == maCols.end() || *rpCol > rnBorder ) if( rpCol == maCols.end() || *rpCol > rnBorder )
{ {
maCols.insert( rpCol, rnBorder ); rpCol = maCols.insert( rpCol, rnBorder );
--rpCol; --rpCol;
incColSpan( nLine, rnCol ); incColSpan( nLine, rnCol );
} }