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

[Noel Grandin]

 cppcanvas/source/mtfrenderer/emfplus.cxx |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 2f1a293e1a119ad12e0b592da9f7e2f7d88e2479
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Apr 26 13:27:32 2013 +0200

    Clang cleanup, unaligned if statement
    
    The extra semi-colons were confusing clang. Just remove the macro,
    it's not adding any real value.
    
    Change-Id: I7f7c312d2c0167a17e31624e197ae75b77fa0c2f
    Reviewed-on: https://gerrit.libreoffice.org/3677
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 2a3d9de..52fc36b 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -870,10 +870,6 @@ namespace cppcanvas
                              (x >> 8) & 0xff, \
                              x & 0xff), \
                         rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
-#define SET_FILL_COLOR(x) \
-    rState.fillColor = COLOR(x);
-#define SET_TEXT_COLOR(x) \
-    rState.textColor = COLOR(x);
 
         void ImplRenderer::EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms,
                                                 OutDevState& rState, const CanvasSharedPtr& rCanvas, bool isColor, sal_uInt32 brushIndexOrColor)
@@ -891,7 +887,7 @@ namespace cppcanvas
                 rState.isFillColorSet = true;
                 rState.isLineColorSet = false;
 
-                SET_FILL_COLOR(brushIndexOrColor);
+                rState.fillColor = COLOR(brushIndexOrColor);
 
                 pPolyAction = ActionSharedPtr ( internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon, rParms.mrCanvas, rState ) );
 
@@ -1641,7 +1637,7 @@ namespace cppcanvas
                                 OUString text = read_uInt16s_ToOUString(rMF, stringLength);
 
                                 double cellSize = setFont (flags & 0xff, rFactoryParms, rState);
-                                SET_TEXT_COLOR( brushId );
+                                rState.textColor = COLOR( brushId );
 
                                 ActionSharedPtr pTextAction(
                                     TextActionFactory::createTextAction(
@@ -1881,7 +1877,7 @@ namespace cppcanvas
                             setFont (flags & 0xff, rFactoryParms, rState);
 
                             if( flags & 0x8000 )
-                                SET_TEXT_COLOR(brushIndexOrColor);
+                                rState.textColor = COLOR( brushIndexOrColor );
 
                             ActionSharedPtr pTextAction(
                                     TextActionFactory::createTextAction(