mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clang cleanup, unaligned if statement

Browse Source 
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@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
This commit is contained in:
Noel Grandin
2013-04-26 13:27:32 +02:00
committed by Tor Lillqvist
parent 8b3b9d2419
commit 2f1a293e1a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cppcanvas/source/mtfrenderer/emfplus.cxx
View File

@@ -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(