diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-07-24 14:20:20 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-08-08 11:31:43 +0200 |
| commit | f4189f0dab25dbb61332d70c434485f8dc28be70 (patch) | |
| tree | 8043749bf7c8aa11bedafbc69f10d71677dad543 /sc | |
| parent | 960b781ba14af8286f49012b47515b5babfb8737 (diff) | |
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@redhat.com>
(cherry picked from commit d909146913c762c2cdb6bed52fbbd817c05681e9)
Diffstat (limited to 'sc')
| -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 dcbf6b4e4df3..0376e9205616 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -146,7 +146,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 ) ) |