Author: alg
Date: Tue Jun 4 15:07:09 2013
New Revision: 1489463
URL: http://svn.apache.org/r1489463
Log:
i120994 Avoid same error for META_TEXTFILLCOLOR_ACTION and
META_TEXTLINECOLOR_ACTION
Modified:
openoffice/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx
Modified: openoffice/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx?rev=1489463&r1=1489462&r2=1489463&view=diff
==============================================================================
--- openoffice/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx
(original)
+++ openoffice/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx Tue Jun
4 15:07:09 2013
@@ -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:
