[Libreoffice-commits] core.git: writerfilter/source

[Caolán McNamara (via logerrit)]

 writerfilter/source/dmapper/DomainMapperTableManager.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a5142999c4e557b80b09f80d967083a02094b5f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Mar 15 16:44:56 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Mar 15 21:05:31 2020 +0100

    !pCellWidths->empty() check means pCellWidths->size() > 0 is always true
    
    Change-Id: I45ea2c5095c2082c5b1a885047f3cbbcd3d6e1c2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90534
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index ea322b6a58f3..ae2d012072c3 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -719,7 +719,7 @@ void DomainMapperTableManager::endOfRowAction()
     else if ( !pCellWidths->empty() &&
                ( m_nLayoutType == NS_ooxml::LN_Value_doc_ST_TblLayout_fixed
                  || pCellWidths->size() == ( nGrids + m_nGridAfter )
-                 || ((bIsIncompleteGrid = true) && nGrids + m_nGridAfter > pTableGrid->size() && pCellWidths->size() > 0) )
+                 || ((bIsIncompleteGrid = true) && nGrids + m_nGridAfter > pTableGrid->size()) )
              )
     {
         // If we're here, then the number of cells does not equal to the amount