diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2017-10-16 22:08:41 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-18 08:44:00 +0200 |
commit | a05bb7bf718caf2405c5bfaa4a90f6468f2d66ff (patch) | |
tree | 741ffef245d470b9acf38bb816fe0da7a3cf1f89 /hwpfilter/source/hwpreader.cxx | |
parent | ebfdb9a15a2228ca85213d7d8e478f92953a54e2 (diff) |
Replace some lists by vectors in hwpfilter
+ simplify some parts
Change-Id: I340d6b6d17f591a58c405965367c15be674103d0
Reviewed-on: https://gerrit.libreoffice.org/43439
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'hwpfilter/source/hwpreader.cxx')
-rw-r--r-- | hwpfilter/source/hwpreader.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 47869520de23..06cef295d392 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -1921,9 +1921,8 @@ void HwpReader::makeTableStyle(Table *tbl) } // cell - for (std::list<TCell*>::iterator it = tbl->cells.begin(), aEnd = tbl->cells.end(); it != aEnd; ++it) + for (auto const& tcell : tbl->cells) { - TCell *tcell = *it; sprintf(buf,"Table%d.%c%d",hbox->style.boxnum, 'A'+ tcell->nColumnIndex, tcell->nRowIndex +1); padd("style:name", sXML_CDATA, ascii( buf )); padd("style:family", sXML_CDATA,"table-cell"); @@ -3475,9 +3474,8 @@ void HwpReader::makeTable(TxtBox * hbox) // cell int j = -1, k = -1; - for (std::list<TCell*>::iterator it = tbl->cells.begin(), aEnd = tbl->cells.end(); it != aEnd; ++it) + for (auto const& tcell : tbl->cells) { - TCell *tcell = *it; if( tcell->nRowIndex > j ) { if( j > k ) |