summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2012-06-11 16:41:34 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-06-17 17:06:36 +0200
commit8806e00dbc14b55cff6072f0f6dcf90e0a11a079 (patch)
treee5fc0f2b640fab71fc38601830a1c0ae2636addf /cppcanvas
parent70ed7beae7b21e391df0a246078c2103f8b3fe3a (diff)
Get rid of GRADIENT_* defines, they conflict with Windows GDI types.
Change-Id: Ia0bc37f81b7213b20fc5093beb46d7a05b1ac931 Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'cppcanvas')
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx14
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,