summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-07-24 14:20:20 +0100
committerEike Rathke <erack@redhat.com>2018-07-26 00:35:33 +0200
commit9becb1824d95caa5905b1192c515ac5b732c45f5 (patch)
tree88668dcdd423b87bdb4387c937793708339cd0df /sc
parentacab09f06fd3016ec551065fadabce8768353c89 (diff)
ofz#9431 don't check attribs of Invalid column
Change-Id: I9c5adcadfa2a8593ff90622449d6bdfa4810f2c0 Reviewed-on: https://gerrit.libreoffice.org/57916 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/rtf/eeimpars.cxx2
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 ) )