mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Assign top cell to the formula group if it's still NULL.

Browse Source 
This can happen when Excel's original shared formula range is across
multiple columns, in which case we split that into multiple groups (one
per column), and initialize top cell only for the left most column.

This fixes the crasher on the doc from fdo#31296.

Change-Id: I9e4def9836947fc67523f0d99ca981465709b934
This commit is contained in:
Kohei Yoshida
2013-12-04 14:35:42 -05:00
parent 13ce74fd9b
commit 0fb7073313
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sc/source/filter/excel/excform.cxx
View File

@@ -133,15 +133,31 @@ void ImportExcel::Formula(
if (pLast && pLast->mpCell && pLast->mnRow == (aScPos.Row()-1))
{
ScFormulaCell* pCell = new ScFormulaCell(pD, aScPos, xGroup);
rDoc.getDoc().EnsureTable(aScPos.Tab());
rDoc.setFormulaCell(aScPos, pCell);
xGroup->mnLength = aScPos.Row() - xGroup->mpTopCell->aPos.Row() + 1;
pCell->SetNeedNumberFormat(false);
if (!rtl::math::isNan(fCurVal))
pCell->SetResultDouble(fCurVal);
GetXFRangeBuffer().SetXF(aScPos, nXF);
SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal, nXF, pCell);
if (!xGroup->mpTopCell && nSharedRow == aScPos.Row())
// This formula group object is a duplicate of the
// original one due to Excel's multi-column shared
// range, and doesn't have the top cell assigned yet.
// Assign the current cell as its top cell.
xGroup->mpTopCell = pCell;
if (xGroup->mpTopCell)
{
rDoc.getDoc().EnsureTable(aScPos.Tab());
rDoc.setFormulaCell(aScPos, pCell);
xGroup->mnLength = aScPos.Row() - xGroup->mpTopCell->aPos.Row() + 1;
pCell->SetNeedNumberFormat(false);
if (!rtl::math::isNan(fCurVal))
pCell->SetResultDouble(fCurVal);
GetXFRangeBuffer().SetXF(aScPos, nXF);
SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal, nXF, pCell);
}
else
{
// No idea what's going on here...
delete pCell;
}
}
}
else