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

Merge pull request #23240 from wwmayer/issue_23222

Browse Source 
Sheet: Verify that UnitExpression is valid
This commit is contained in:
Benjamin Nauck
2025-08-20 16:40:39 +02:00
committed by GitHub
parent 1476927434 a8959de56d
commit bd5ecda896
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
View File

@@ -221,12 +221,19 @@ void PropertiesDialog::displayUnitChanged(const QString& text)
QPalette palette = ui->displayUnit->palette();
try {
std::unique_ptr<UnitExpression> e(
std::unique_ptr<UnitExpression> expr(
App::ExpressionParser::parseUnit(sheet, text.toUtf8().constData()));
displayUnit = DisplayUnit(text.toUtf8().constData(), e->getUnit(), e->getScaler());
palette.setColor(QPalette::Text, Qt::black);
displayUnitOk = true;
if (expr) {
displayUnit = DisplayUnit(text.toStdString(), expr->getUnit(), expr->getScaler());
palette.setColor(QPalette::Text, Qt::black);
displayUnitOk = true;
}
else {
displayUnit = DisplayUnit();
palette.setColor(QPalette::Text, text.size() == 0 ? Qt::black : Qt::red);
displayUnitOk = false;
}
}
catch (...) {
displayUnit = DisplayUnit();