From 856c57f20f9b07c686a854e0ccbb6ee3b0ee4791 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 7 Mar 2018 08:45:49 +0200 Subject: use more Color in cppcanvas..drawinglayer Change-Id: Ib0f15e8d4c01c1d2059cf32cc882042766d2a682 Reviewed-on: https://gerrit.libreoffice.org/50861 Tested-by: Jenkins Reviewed-by: Noel Grandin --- cppcanvas/source/mtfrenderer/implrenderer.cxx | 6 +++--- cppcanvas/source/mtfrenderer/textaction.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cppcanvas') diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 5d45c82b0f59..806353dbe543 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -912,21 +912,21 @@ namespace cppcanvas ::Color aTextColor = vcl::unotools::doubleSequenceToColor( rState.textColor, xColorSpace ); - aReliefColor = ::COL_LIGHTGRAY; + aReliefColor = COL_LIGHTGRAY; // we don't have a automatic color, so black is always // drawn on white (literally copied from // vcl/source/gdi/outdev3.cxx) if( aTextColor == COL_BLACK ) { - aTextColor = ::COL_WHITE; + aTextColor = COL_WHITE; rParms.mrStates.getState().textColor = vcl::unotools::colorToDoubleSequence( aTextColor, xColorSpace ); } if( aTextColor == COL_WHITE ) - aReliefColor = ::COL_BLACK; + aReliefColor = COL_BLACK; aReliefColor.SetTransparency( aTextColor.GetTransparency() ); } diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index cc5c382187dc..7444c06c0012 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -1610,7 +1610,7 @@ namespace cppcanvas mnOutlineWidth( calcOutlineWidth(rState,rVDev) ), maFillColor( vcl::unotools::colorToDoubleSequence( - ::COL_WHITE, + COL_WHITE, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )), maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ), maLinesOverallSize(), @@ -1652,7 +1652,7 @@ namespace cppcanvas mnOutlineWidth( calcOutlineWidth(rState,rVDev) ), maFillColor( vcl::unotools::colorToDoubleSequence( - ::COL_WHITE, + COL_WHITE, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )), maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ), maLinesOverallSize(), -- cgit