summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-06-04 14:08:59 +0300
committerTor Lillqvist <tml@iki.fi>2013-06-04 14:08:59 +0300
commit86c55c35ea87225ea5893858dfd5eb0005095484 (patch)
tree67f530486d27c25ce4656bd7b3a8fa21b4a6cd8b /cppcanvas
parentcf53e0ea70bc56e70332f5770f9cb88f68c0a65d (diff)
Fix merge glitch (?)
Change-Id: I4cc5d49f8df63c46e50f2bfd64de7bd257ff9d76
Diffstat (limited to 'cppcanvas')
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 3b03b48294ec..59fead1b6822 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1469,7 +1469,7 @@ namespace cppcanvas
// #120994# Do switch on/off LineColor, even when a overriding one is set
bool bSetting(static_cast<MetaLineColorAction*>(pCurrAct)->IsSetting());
- getState( rStates ).isLineColorSet = bSetting;
+ rStates.getState().isLineColorSet = bSetting;
}
break;
@@ -1486,7 +1486,7 @@ namespace cppcanvas
// #120994# Do switch on/off FillColor, even when a overriding one is set
bool bSetting(static_cast<MetaFillColorAction*>(pCurrAct)->IsSetting());
- getState( rStates ).isFillColorSet = bSetting;
+ rStates.getState().isFillColorSet = bSetting;
}
break;