Kaydet (Commit) 11e381c5 authored tarafından Caolán McNamara's avatar Caolán McNamara

crashtesting: failure on import of tdf90694-1.ots

since...

commit 7282014e
Date:   Fri Feb 1 15:15:16 2019 +0100

    tdf#50916 Makes numbers of columns dynamic

Change-Id: I7a624f391c85f9c7af07f951c9da3914460b7526
Reviewed-on: https://gerrit.libreoffice.org/70602
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 0b022f7e
......@@ -2059,10 +2059,18 @@ void ScTable::MaybeAddExtraColumn(SCCOL& rCol, SCROW nRow, OutputDevice* pDev, d
SCCOL nNewCol = rCol;
while (nMissing > 0 && nNewCol < MAXCOL)
{
ScRefCellValue aNextCell = aCol[nNewCol+1].GetCellValue(nRow);
if (!aNextCell.isEmpty())
auto nNextCol = nNewCol + 1;
bool bNextEmpty = true;
if (GetAllocatedColumnsCount() > nNextCol)
{
ScRefCellValue aNextCell = aCol[nNextCol].GetCellValue(nRow);
bNextEmpty = aNextCell.isEmpty();
}
if (!bNextEmpty)
{
// Cell content in a next column ends display of this string.
nMissing = 0;
}
else
nMissing -= GetColWidth(++nNewCol);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment