diff options
author | Jan Holesovsky <kendy@suse.cz> | 2012-06-11 16:41:34 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2012-06-12 16:31:43 +0200 |
commit | 6d78c490b0923c22d125286ebdae2e41edd28f6c (patch) | |
tree | 911ec6d9b8ab876db06e296a2e2517da797d8d30 /cppcanvas | |
parent | 99ced0bdaedeedd13de73a66e159f45cada6e3b4 (diff) |
Get rid of GRADIENT_* defines, they conflict with Windows GDI types.
Change-Id: Ia0bc37f81b7213b20fc5093beb46d7a05b1ac931
Diffstat (limited to 'cppcanvas')
-rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 1b0f8cd5bfcf..028aa0c7d33c 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -634,7 +634,7 @@ namespace cppcanvas uno::Sequence< uno::Sequence < double > > aColors(2); uno::Sequence< double > aStops(2); - if( rGradient.GetStyle() == GRADIENT_AXIAL ) + if( rGradient.GetStyle() == GradientStyle_AXIAL ) { aStops.realloc(3); aColors.realloc(3); @@ -671,7 +671,7 @@ namespace cppcanvas rtl::OUString aGradientService; switch( rGradient.GetStyle() ) { - case GRADIENT_LINEAR: + case GradientStyle_LINEAR: basegfx::tools::createLinearODFGradientInfo(aGradInfo, aBounds, nSteps, @@ -683,7 +683,7 @@ namespace cppcanvas aGradientService = "LinearGradient"; break; - case GRADIENT_AXIAL: + case GradientStyle_AXIAL: { // Adapt the border so that it is suitable // for the axial gradient. An axial @@ -717,7 +717,7 @@ namespace cppcanvas break; } - case GRADIENT_RADIAL: + case GradientStyle_RADIAL: basegfx::tools::createRadialODFGradientInfo(aGradInfo, aBounds, aOffset, @@ -726,7 +726,7 @@ namespace cppcanvas aGradientService = "EllipticalGradient"; break; - case GRADIENT_ELLIPTICAL: + case GradientStyle_ELLIPTICAL: basegfx::tools::createEllipticalODFGradientInfo(aGradInfo, aBounds, aOffset, @@ -736,7 +736,7 @@ namespace cppcanvas aGradientService = "EllipticalGradient"; break; - case GRADIENT_SQUARE: + case GradientStyle_SQUARE: basegfx::tools::createSquareODFGradientInfo(aGradInfo, aBounds, aOffset, @@ -746,7 +746,7 @@ namespace cppcanvas aGradientService = "RectangularGradient"; break; - case GRADIENT_RECT: + case GradientStyle_RECT: basegfx::tools::createRectangularODFGradientInfo(aGradInfo, aBounds, aOffset, |