diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-07-24 14:20:20 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-02 14:08:20 +0200 |
| commit | 5567a151fc245d801777339a9d0ecea04e48f50f (patch) | |
| tree | 9e745aac5c7f9b0f7a9602e0fb50fbf98ed990b7 | |
| parent | ofz#9507 wrong start point for Johab block 59 (diff) | |
| download | core-5567a151fc245d801777339a9d0ecea04e48f50f.tar.gz core-5567a151fc245d801777339a9d0ecea04e48f50f.zip | |
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)
| -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 77e0c9bc0d2d..8b7e50886dd1 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, HASATTR_OVERLAPPED ) ) |