[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra/words-autocolor-uzak-ltvrdy=5D_filters/wor?=
From:       Matus Uzak <matus.uzak () ixonos ! com>
Date:       2011-06-12 16:11:31
Message-ID: 20110612161131.A306FA60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 96c572be26246518004b0a15fe1fb720ff5cdcb9 by Matus Uzak.
Committed on 12/06/2011 at 18:09.
Pushed by uzak into branch 'words-autocolor-uzak-ltvrdy'.

DOC: shdToColorStr update

* I disabled a bit of the lately added code temporary, because it caused
  regressions on bug 273549.

M  +9    -9    filters/words/msword-odf/conversion.cpp     

http://commits.kde.org/calligra/96c572be26246518004b0a15fe1fb720ff5cdcb9

diff --git a/filters/words/msword-odf/conversion.cpp b/filters/words/msword-odf/conversion.cpp
index 115f20d..8de0875 100644
--- a/filters/words/msword-odf/conversion.cpp
+++ b/filters/words/msword-odf/conversion.cpp
@@ -389,15 +389,15 @@ QString Conversion::shdToColorStr(const wvWare::Word97::SHD& shd, const QString&
             ret.append(QString::number(grayClr | 0xff000000, 16).right(6).toUpper());
             ret.prepend('#');
 
-            qreal pct = QColor(ret).red() / 255.0;
-            QColor backColor(shd.cvBack);
-            QColor foreColor(shd.cvFore);
-
-            QColor result;
-            result.setRed( yMix(backColor.red(), foreColor.red(), pct) );
-            result.setGreen( yMix(backColor.green(), foreColor.green(), pct) );
-            result.setBlue( yMix(backColor.blue(), foreColor.blue(), pct) );
-            ret = result.name();
+//             qreal pct = QColor(ret).red() / 255.0;
+//             QColor backColor(shd.cvBack);
+//             QColor foreColor(shd.cvFore);
+
+//             QColor result;
+//             result.setRed( yMix(backColor.red(), foreColor.red(), pct) );
+//             result.setGreen( yMix(backColor.green(), foreColor.green(), pct) );
+//             result.setBlue( yMix(backColor.blue(), foreColor.blue(), pct) );
+//             ret = result.name();
         }
     }
     break;

[prev in list] [next in list] [prev in thread] [next in thread]