sc/source/filter/rtf/eeimpars.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit a82f180a50ecdbd6870e665b5304419bddbeeeb8 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Jul 24 14:20:20 2018 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Thu Jul 26 10:50:50 2018 +0200 ofz#9431 don't check attribs of Invalid column Change-Id: I9c5adcadfa2a8593ff90622449d6bdfa4810f2c0 Reviewed-on: https://gerrit.libreoffice.org/57918 Reviewed-by: Eike Rathke <[email protected]> Reviewed-by: Markus Mohrhard <[email protected]> Reviewed-by: Michael Stahl <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 890c536f80fd..da23becae30c 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -157,7 +157,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu SCCOL nCol = nStartCol + pE->nCol + nMergeColAdd; // Determine RowMerge // Pure ColMerge and ColMerge of the first MergeRow already done during parsing - if ( nRow <= nOverlapRowMax ) + if (nRow <= nOverlapRowMax && ValidCol(nCol)) { while ( nCol <= MAXCOL && mpDoc->HasAttrib( nCol, nRow, nTab, nCol, nRow, nTab, HasAttrFlags::Overlapped ) ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
