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

Spreadsheet: fix possible crash in SheetModel::setData

Browse Source 
See also: https://forum.freecadweb.org/viewtopic.php?f=8&t=68529
This commit is contained in:
wmayer
2022-05-13 18:23:27 +02:00
committed by Uwe
parent f2ae822add
commit 296cbd8482
2 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Mod/Spreadsheet/Gui/SheetModel.cpp
View File

@@ -464,6 +464,25 @@ QVariant SheetModel::headerData(int section, Qt::Orientation orientation, int ro
return QVariant();
}
void SheetModel::setCellData(QModelIndex index, QString str)
{
try {
CellAddress address(index.row(), index.column());
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Edit cell"));
// Because of possible complication of recursively escaped
// characters, let's take a shortcut and bypass the command
// interface for now.
sheet->setContent(address, str.toUtf8().constData());
Gui::Command::commitCommand();
Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.recompute()");
}
catch (const Base::Exception& e) {
e.ReportException();
Gui::Command::abortCommand();
}
}
bool SheetModel::setData(const QModelIndex & index, const QVariant & value, int role)
{
if (role == Qt::DisplayRole) {
@@ -472,32 +491,19 @@ bool SheetModel::setData(const QModelIndex & index, const QVariant & value, int
else if (role == Qt::EditRole) {
CellAddress address(index.row(), index.column());
try {
QString str = value.toString();
QString str = value.toString();
// Check to see if this is already the value in the cell, and skip the update if so
auto cell = sheet->getCell(address);
if (cell) {
std::string oldContent;
cell->getStringContent(oldContent);
if (str == QString::fromStdString(oldContent))
return true;
}
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Edit cell"));
// Because of possible complication of recursively escaped
// characters, let's take a shortcut and bypass the command
// interface for now.
sheet->setContent(address, str.toUtf8().constData());
Gui::Command::commitCommand();
Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.recompute()");
}
catch (const Base::Exception& e) {
e.ReportException();
Gui::Command::abortCommand();
return false;
// Check to see if this is already the value in the cell, and skip the update if so
auto cell = sheet->getCell(address);
if (cell) {
std::string oldContent;
cell->getStringContent(oldContent);
if (str == QString::fromStdString(oldContent))
return true;
}
QMetaObject::invokeMethod(this, "setCellData", Qt::QueuedConnection,
Q_ARG(QModelIndex, index), Q_ARG(QString, str));
}
return true;
}