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

Spreadsheet: Fix header uniformity + trailing whitespace

Browse Source 
[skip ci]
This commit is contained in:
luz paz
2020-11-27 11:09:50 -05:00
committed by wwmayer
parent 096a172137
commit abf4c92280
14 changed files with 172 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) Eivind Kvedalen (eivind@kvedalen.name) 2015 *
* Copyright (c) 2015 Eivind Kvedalen <eivind@kvedalen.name> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
@@ -391,8 +391,8 @@ QVariant SheetModel::data(const QModelIndex &index, int role) const
return QVariant();
}
}
else if (prop->isDerivedFrom(App::PropertyFloat::getClassTypeId())
|| prop->isDerivedFrom(App::PropertyInteger::getClassTypeId()))
else if (prop->isDerivedFrom(App::PropertyFloat::getClassTypeId())
|| prop->isDerivedFrom(App::PropertyInteger::getClassTypeId()))
{
/* Number */
double d;
@@ -454,7 +454,7 @@ QVariant SheetModel::data(const QModelIndex &index, int role) const
if (cell->getForeground(color))
return QVariant::fromValue(QColor(255.0 * color.r, 255.0 * color.g, 255.0 * color.b, 255.0 * color.a));
else
else
return QVariant(QColor(textFgColor));
}
case Qt::TextAlignmentRole: {
@@ -537,7 +537,7 @@ bool SheetModel::setData(const QModelIndex & index, const QVariant & value, int
std::string strAddress = address.toString();
str.replace(QString::fromUtf8("\\"), QString::fromUtf8("\\\\"));
str.replace(QString::fromUtf8("'"), QString::fromUtf8("\\'"));
FCMD_OBJ_CMD(sheet,"set('" << strAddress << "','" <<
FCMD_OBJ_CMD(sheet,"set('" << strAddress << "','" <<
str.toUtf8().constData() << "')");
#else
sheet->setContent(address, str.toUtf8().constData());