diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-07-24 14:20:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-07-24 16:25:20 +0200 |
| commit | 8c29928de76ff24f9b6dc4dba08940e63e54413d (patch) | |
| tree | 1e32948a69c2b8f3b086d7fd0d4a0d2d3c86f1d2 /sc/source/filter/rtf/eeimpars.cxx | |
| parent | ac8a1a146fa362ebe6849ae1a592a0629801971d (diff) | |
ofz#9431 don't check attribs of Invalid column
Change-Id: I9c5adcadfa2a8593ff90622449d6bdfa4810f2c0
Reviewed-on: https://gerrit.libreoffice.org/57915
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/filter/rtf/eeimpars.cxx')
| -rw-r--r-- | sc/source/filter/rtf/eeimpars.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 ) ) |