From 39e21050fe9e47b0496b0f4cc9e85f6577f0f6ce Mon Sep 17 00:00:00 2001
From: Armin Le Grand <alg@apache.org>
Date: Mon, 3 Jun 2013 14:55:13 +0000
Subject: Resolves: #i120994# Corrected Line/FillColor OnOff state handling

(cherry picked from commit 2d1c3f406b3390587bd800d05a07e8349b4582f5)

Change-Id: I3ec3e83354c60c53263b8f823d6a0037dfc9130b
---
 cppcanvas/source/mtfrenderer/implrenderer.cxx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'cppcanvas')

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 43094a3f09f9..3b03b48294ec 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1464,6 +1464,13 @@ namespace cppcanvas
                                            rStates.getState().lineColor,
                                            rCanvas );
                         }
+                        else
+                        {
+                            // #120994# Do switch on/off LineColor, even when a overriding one is set
+                            bool bSetting(static_cast<MetaLineColorAction*>(pCurrAct)->IsSetting());
+
+                            getState( rStates ).isLineColorSet = bSetting;
+                        }
                         break;
 
                     case META_FILLCOLOR_ACTION:
@@ -1474,6 +1481,13 @@ namespace cppcanvas
                                            rStates.getState().fillColor,
                                            rCanvas );
                         }
+                        else
+                        {
+                            // #120994# Do switch on/off FillColor, even when a overriding one is set
+                            bool bSetting(static_cast<MetaFillColorAction*>(pCurrAct)->IsSetting());
+
+                            getState( rStates ).isFillColorSet = bSetting;
+                        }
                         break;
 
                     case META_TEXTCOLOR_ACTION:
-- 
cgit