[Libreoffice-commits] core.git: cppcanvas/source

Tor Lillqvist tml at iki.fi
Tue Jun 4 04:09:30 PDT 2013


 cppcanvas/source/mtfrenderer/implrenderer.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 86c55c35ea87225ea5893858dfd5eb0005095484
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 4 14:08:59 2013 +0300

    Fix merge glitch (?)
    
    Change-Id: I4cc5d49f8df63c46e50f2bfd64de7bd257ff9d76

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 3b03b48..59fead1b 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;
 


More information about the Libreoffice-commits mailing list