commit 3d39dad6d93c979ac64244ecb9acfbd8a5fbd6c6
author Caolán McNamara <caolanm@redhat.com> Tue Sep 11 11:25:54 2018 +0100
committer Caolán McNamara <caolanm@redhat.com> Tue Sep 11 13:17:31 2018 +0200
tree f7ed961d72b3104bc9990fbbf21a4bebd6171b9e
parent d072795d78342c4be68d9410ee438fa3607c34ac

ofz#10228 Integer-overflow

Change-Id: Ifb7e6ad6f5ffe71c3c5bb7cca9cb3b27bff7943a
Reviewed-on: https://gerrit.libreoffice.org/60308
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

writerfilter/source/dmapper/DomainMapperTableManager.cxx

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index c473ecc..37f07f2 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -627,8 +627,8 @@ void DomainMapperTableManager::endOfRowAction()
    // a grid of "20:40:20" and it doesn't have to do something with the tableWidth
    // -> so we have get the sum of each grid entry for the fullWidthRelative:
    int nFullWidthRelative = 0;
    for (sal_Int32 i : (*pTableGrid.get()))
        nFullWidthRelative += i;
    for (int i : (*pTableGrid.get()))
        nFullWidthRelative = o3tl::saturating_add(nFullWidthRelative, i);

    if( pTableGrid->size() == ( m_nGridBefore + nGrids + m_nGridAfter ) && m_nCell.back( ) > 0 )
    {