diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-07-24 14:20:20 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-10 16:33:44 +0200 |
| commit | 9610f68db80418f65ba52ed336ffaf429d528aae (patch) | |
| tree | 5bd5999839a12ef3dded5a2d3bd5bdd8b0ae6ea6 /sc | |
| parent | 45e7be9215f1e03c0d2ff7e2edd74ba61999c41e (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 e0202ce7e6fe..41c9ded0f3a7 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -145,7 +145,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 ) ) |