[calligra/calligra/2.4] libs/kotext/styles: Correctly roundtrip use-window-color.

[Thorsten Zachmann]

Git commit fb72a3a2db5157569688d55fbb8db43f9e6538f7 by Thorsten Zachmann.
Committed on 24/03/2012 at 06:51.
Pushed by zachmann into branch 'calligra/2.4'.

Correctly roundtrip use-window-color.

Before the patch when saving the document attached to bug 296666 additionally to the use-window-color also
a fo:color was saved. However this attributes needs to be stripped when a inherited style sets the use-window-color

BUG: 296666

Please review so I can backport to 2.4 branch.

Roundtrip tested with my odp and odt test set.

CCMAIL: calligra-devel at kde.org
Reviewd by: boemann
(cherry picked from commit 10128edd6776b25e493ccd919792b6877cdca52d)

M  +4    -0    libs/kotext/styles/KoCharacterStyle.cpp

http://commits.kde.org/calligra/fb72a3a2db5157569688d55fbb8db43f9e6538f7

diff --git a/libs/kotext/styles/KoCharacterStyle.cpp b/libs/kotext/styles/KoCharacterStyle.cpp
index 73b6910..115d6b4 100644
--- a/libs/kotext/styles/KoCharacterStyle.cpp
+++ b/libs/kotext/styles/KoCharacterStyle.cpp
@@ -482,6 +482,10 @@ void KoCharacterStyle::applyStyle(QTextCharFormat &format) const
             if (it.key() == QTextFormat::ForegroundBrush) {
                 clearProperty.append(KoCharacterStyle::UseWindowFontColor);
             }
+            else if (it.key() == KoCharacterStyle::UseWindowFontColor) {
+                clearProperty.append(QTextFormat::ForegroundBrush);
+            }
+
         }
         ++it;
     }