sc/source/filter/rtf/eeimpars.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 9becb1824d95caa5905b1192c515ac5b732c45f5 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Tue Jul 24 14:20:20 2018 +0100 Commit: Eike Rathke <er...@redhat.com> CommitDate: Thu Jul 26 00:35:33 2018 +0200 ofz#9431 don't check attribs of Invalid column Change-Id: I9c5adcadfa2a8593ff90622449d6bdfa4810f2c0 Reviewed-on: https://gerrit.libreoffice.org/57916 Tested-by: Jenkins Reviewed-by: Eike Rathke <er...@redhat.com> 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 libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits