You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/06/03 16:55:13 UTC
svn commit: r1489018 -
/openoffice/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx
Author: alg
Date: Mon Jun 3 14:55:13 2013
New Revision: 1489018
URL: http://svn.apache.org/r1489018
Log:
i120994 Corrected Line/FillColor OnOff state handling
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=1489018&r1=1489017&r2=1489018&view=diff
==============================================================================
--- openoffice/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx (original)
+++ openoffice/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx Mon Jun 3 14:55:13 2013
@@ -1496,6 +1496,13 @@ namespace cppcanvas
getState( rStates ).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:
@@ -1506,6 +1513,13 @@ namespace cppcanvas
getState( rStates ).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: