[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cppcanvas/source

[Armin Le Grand]

 cppcanvas/source/mtfrenderer/implrenderer.cxx |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 839e9f69c68fd32a17fc90d31a68f0b2f0c2fff1
Author: Armin Le Grand <alg at apache.org>
Date:   Tue Jun 4 15:07:09 2013 +0000

    i120994 Avoid same error for META_TEXTFILLCOLOR_ACTION and META_TEXTLINECOLOR_ACTION

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 2e284c6..771170b 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1551,6 +1551,13 @@ namespace cppcanvas
                                            getState( rStates ).textFillColor,
                                            rCanvas );
                         }
+                        else
+                        {
+                            // #120994# Do switch on/off TextFillColor, even when a overriding one is set
+                            bool bSetting(static_cast<MetaTextFillColorAction*>(pCurrAct)->IsSetting());
+
+                            getState( rStates ).isTextFillColorSet = bSetting;
+                        }
                         break;
 
                     case META_TEXTLINECOLOR_ACTION:
@@ -1561,6 +1568,13 @@ namespace cppcanvas
                                            getState( rStates ).textLineColor,
                                            rCanvas );
                         }
+                        else
+                        {
+                            // #120994# Do switch on/off TextLineColor, even when a overriding one is set
+                            bool bSetting(static_cast<MetaTextLineColorAction*>(pCurrAct)->IsSetting());
+
+                            getState( rStates ).isTextLineColorSet = bSetting;
+                        }
                         break;
 
                     case META_TEXTALIGN_ACTION: