kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fixes #0003361: Spreadsheet: Inserting Row Cause Crash - FC Daily v0.17

Browse Source
This commit is contained in:
wmayer
2018-03-25 13:39:21 +02:00
parent 51d0d4e19e
commit f485a0786f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Spreadsheet/App/PropertySheet.cpp
View File

@@ -358,7 +358,9 @@ Cell * PropertySheet::cellAt(CellAddress address)
// address actually inside a merged cell
if (j != mergedCells.end()) {
std::map<CellAddress, Cell*>::const_iterator i = data.find(j->second);
assert(i != data.end());
//assert(i != data.end());
if (i == data.end())
return nullptr;
return i->second;
}
@@ -378,7 +380,9 @@ const Cell * PropertySheet::cellAt(CellAddress address) const
// address actually inside a merged cell
if (j != mergedCells.end()) {
std::map<CellAddress, Cell*>::const_iterator i = data.find(j->second);
assert(i != data.end());
//assert(i != data.end());
if (i == data.end())
return nullptr;
return i->second;
}
@@ -885,7 +889,9 @@ void PropertySheet::getSpans(CellAddress address, int & rows, int & cols) const
if (i != mergedCells.end()) {
CellAddress anchor = i->second;
cellAt(anchor)->getSpans(rows, cols);
const Cell* cell = cellAt(anchor);
if (cell)
cell->getSpans(rows, cols);
}
else {
rows = cols = 1;