[Libreoffice-commits] core.git: writerfilter/source
Mike Kaganski
mike.kaganski at collabora.com
Tue Jul 25 13:57:36 UTC 2017
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
New commits:
commit d3f48117216a02bc8ae86e821b54abae1a2c2c39
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Tue Jul 25 14:10:31 2017 +0200
DomainMapperTableManager::sprm: use std::find
Change-Id: Iaad2fe950372ecd5261d83554015dc771b3abbf8
Reviewed-on: https://gerrit.libreoffice.org/40403
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index fa86c2e1471f..82e7640471fe 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -176,18 +176,9 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
the final sizing of the table, but then must use the contents of each cell to determine final column widths.
(See 17.18.87 of the ISO/IEC 29500-1:2011.)
*/
- bool bFixed = true;
IntVectorPtr pCellWidths = getCurrentCellWidths();
// Check whether all cells have fixed widths in the given row of table.
- for (std::vector<sal_Int32>::const_iterator aValIter = pCellWidths->begin(); aValIter != pCellWidths->end(); ++aValIter)
- {
- if (*aValIter == -1)
- {
- bFixed = false;
- break;
- }
- }
-
+ bool bFixed = std::find(pCellWidths->begin(), pCellWidths->end(), -1) == pCellWidths->end();
if (!bFixed)
{
// Set the width type of table with 'Auto' and set the width value to 0 (as per grid values)
More information about the Libreoffice-commits
mailing list