[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/rtf/eeimpars.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d909146913c762c2cdb6bed52fbbd817c05681e9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 24 14:20:20 2018 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Thu Jul 26 00:35:46 2018 +0200

    ofz#9431 don't check attribs of Invalid column
    
    Change-Id: I9c5adcadfa2a8593ff90622449d6bdfa4810f2c0
    Reviewed-on: https://gerrit.libreoffice.org/57917
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index a3af0cb868b7..1518e56e419f 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -156,7 +156,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 ) )