From 614a914926b3fac78c9b43760f2be35625f6ed4a Mon Sep 17 00:00:00 2001
From: Eivind Kvedalen <eivind@kvedalen.name>
Date: Wed, 7 Dec 2016 23:55:56 +0100
Subject: [PATCH] Spreadsheet: Fixed dead code issue reported by Coverity
 (128977).

---
 src/Mod/Spreadsheet/Gui/SheetModel.cpp | 57 +++++++++++++++++---------
 src/Mod/Spreadsheet/Gui/SheetModel.h   |  3 ++
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/Mod/Spreadsheet/Gui/SheetModel.cpp b/src/Mod/Spreadsheet/Gui/SheetModel.cpp
index d82a620d3..6ecba544b 100644
--- a/src/Mod/Spreadsheet/Gui/SheetModel.cpp
+++ b/src/Mod/Spreadsheet/Gui/SheetModel.cpp
@@ -48,6 +48,9 @@ SheetModel::SheetModel(Sheet *_sheet, QObject *parent)
 
     ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Spreadsheet");
     aliasBgColor = QColor(Base::Tools::fromStdString(hGrp->GetASCII("AliasedCellBackgroundColor", "#feff9e")));
+    textFgColor = QColor(Base::Tools::fromStdString(hGrp->GetASCII("TextColor", "#000000")));
+    positiveFgColor = QColor(Base::Tools::fromStdString(hGrp->GetASCII("PositiveNumberColor", "#000000")));
+    negativeFgColor = QColor(Base::Tools::fromStdString(hGrp->GetASCII("NegativeNumberColor", "#000000")));
 }
 
 SheetModel::~SheetModel()
@@ -213,15 +216,9 @@ QVariant SheetModel::data(const QModelIndex &index, int role) const
     if (prop == 0)
         return QVariant();
 
-    Color color;
-    if (role == Qt::TextColorRole || role == Qt::ForegroundRole) {
-        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
-            return QVariant();
-    }
-
     if (role == Qt::BackgroundRole) {
+        Color color;
+
         if (cell->getBackground(color))
             return QVariant::fromValue(QColor(255.0 * color.r, 255.0 * color.g, 255.0 * color.b, 255.0 * color.a));
         else {
@@ -273,8 +270,14 @@ QVariant SheetModel::data(const QModelIndex &index, int role) const
         const App::PropertyString * stringProp = static_cast<const App::PropertyString*>(prop);
 
         switch (role) {
-        case Qt::TextColorRole: // dead code!
-            return QVariant::fromValue(QColor(Qt::black));
+        case Qt::TextColorRole: {
+            Color color;
+
+            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
+                return QVariant(QColor(textFgColor));
+        }
         case Qt::DisplayRole:
             return QVariant(QString::fromUtf8(stringProp->getValue()));
         case Qt::TextAlignmentRole: {
@@ -297,11 +300,18 @@ QVariant SheetModel::data(const QModelIndex &index, int role) const
         const App::PropertyQuantity * floatProp = static_cast<const App::PropertyQuantity*>(prop);
 
         switch (role) {
-        case  Qt::TextColorRole: // dead code!
-            if (floatProp->getValue() < 0)
-                return QVariant::fromValue(QColor(Qt::red));
-            else
-                return QVariant::fromValue(QColor(Qt::blue));
+        case  Qt::TextColorRole: {
+            Color color;
+
+            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 {
+                if (floatProp->getValue() < 0)
+                    return QVariant::fromValue(QColor(negativeFgColor));
+                else
+                    return QVariant::fromValue(QColor(positiveFgColor));
+            }
+        }
         case Qt::TextAlignmentRole: {
             if (alignment & Cell::ALIGNMENT_HIMPLIED) {
                 qtAlignment &= ~(Qt::AlignLeft | Qt::AlignHCenter | Qt::AlignRight);
@@ -342,11 +352,18 @@ QVariant SheetModel::data(const QModelIndex &index, int role) const
         const App::PropertyFloat * floatProp = static_cast<const App::PropertyFloat*>(prop);
 
         switch (role) {
-        case  Qt::TextColorRole: // dead code!
-            if (floatProp->getValue() < 0)
-                return QVariant::fromValue(QColor(Qt::red));
-            else
-                return QVariant::fromValue(QColor(Qt::blue));
+        case  Qt::TextColorRole: {
+            Color color;
+
+            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 {
+                if (floatProp->getValue() < 0)
+                    return QVariant::fromValue(QColor(negativeFgColor));
+                else
+                    return QVariant::fromValue(QColor(positiveFgColor));
+            }
+        }
         case Qt::TextAlignmentRole: {
             if (alignment & Cell::ALIGNMENT_HIMPLIED) {
                 qtAlignment &= ~(Qt::AlignLeft | Qt::AlignHCenter | Qt::AlignRight);
diff --git a/src/Mod/Spreadsheet/Gui/SheetModel.h b/src/Mod/Spreadsheet/Gui/SheetModel.h
index 6a9738a71..44a599359 100644
--- a/src/Mod/Spreadsheet/Gui/SheetModel.h
+++ b/src/Mod/Spreadsheet/Gui/SheetModel.h
@@ -55,6 +55,9 @@ private:
     boost::BOOST_SIGNALS_NAMESPACE::scoped_connection cellUpdatedConnection;
     Spreadsheet::Sheet * sheet;
     QColor aliasBgColor;
+    QColor textFgColor;
+    QColor positiveFgColor;
+    QColor negativeFgColor;
 };
 
 }