diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-06-11 16:41:34 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-17 17:06:36 +0200 |
| commit | 8806e00dbc14b55cff6072f0f6dcf90e0a11a079 (patch) | |
| tree | e5fc0f2b640fab71fc38601830a1c0ae2636addf /drawinglayer | |
| parent | 70ed7beae7b21e391df0a246078c2103f8b3fe3a (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 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 12 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 26 |
2 files changed, 19 insertions, 19 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 448ae143a493..fa5b1ae1a9f0 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -892,32 +892,32 @@ namespace switch(rGradient.GetStyle()) { - case GRADIENT_LINEAR : + case GradientStyle_LINEAR : { aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_LINEAR; break; } - case GRADIENT_AXIAL : + case GradientStyle_AXIAL : { aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_AXIAL; break; } - case GRADIENT_RADIAL : + case GradientStyle_RADIAL : { aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RADIAL; break; } - case GRADIENT_ELLIPTICAL : + case GradientStyle_ELLIPTICAL : { aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_ELLIPTICAL; break; } - case GRADIENT_SQUARE : + case GradientStyle_SQUARE : { aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_SQUARE; break; } - default : // GRADIENT_RECT + default : // GradientStyle_RECT { aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RECT; break; diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 7387700edaa1..3cad086529f6 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -340,32 +340,32 @@ namespace drawinglayer { default : // attribute::GRADIENTSTYLE_LINEAR : { - o_rVCLGradient.SetStyle(GRADIENT_LINEAR); + o_rVCLGradient.SetStyle(GradientStyle_LINEAR); break; } case attribute::GRADIENTSTYLE_AXIAL : { - o_rVCLGradient.SetStyle(GRADIENT_AXIAL); + o_rVCLGradient.SetStyle(GradientStyle_AXIAL); break; } case attribute::GRADIENTSTYLE_RADIAL : { - o_rVCLGradient.SetStyle(GRADIENT_RADIAL); + o_rVCLGradient.SetStyle(GradientStyle_RADIAL); break; } case attribute::GRADIENTSTYLE_ELLIPTICAL : { - o_rVCLGradient.SetStyle(GRADIENT_ELLIPTICAL); + o_rVCLGradient.SetStyle(GradientStyle_ELLIPTICAL); break; } case attribute::GRADIENTSTYLE_SQUARE : { - o_rVCLGradient.SetStyle(GRADIENT_SQUARE); + o_rVCLGradient.SetStyle(GradientStyle_SQUARE); break; } case attribute::GRADIENTSTYLE_RECT : { - o_rVCLGradient.SetStyle(GRADIENT_RECT); + o_rVCLGradient.SetStyle(GradientStyle_RECT); break; } } @@ -1542,16 +1542,16 @@ namespace drawinglayer switch(aVCLGradient.GetStyle()) { - default : // GRADIENT_LINEAR: - case GRADIENT_AXIAL: + default : // GradientStyle_LINEAR: + case GradientStyle_AXIAL: eGrad = SvtGraphicFill::gradientLinear; break; - case GRADIENT_RADIAL: - case GRADIENT_ELLIPTICAL: + case GradientStyle_RADIAL: + case GradientStyle_ELLIPTICAL: eGrad = SvtGraphicFill::gradientRadial; break; - case GRADIENT_SQUARE: - case GRADIENT_RECT: + case GradientStyle_SQUARE: + case GradientStyle_RECT: eGrad = SvtGraphicFill::gradientRectangular; break; } @@ -1828,7 +1828,7 @@ namespace drawinglayer const sal_uInt8 nTransPercentVcl((sal_uInt8)basegfx::fround(rUniTransparenceCandidate.getTransparence() * 255.0)); const Color aTransColor(nTransPercentVcl, nTransPercentVcl, nTransPercentVcl); - aVCLGradient.SetStyle(GRADIENT_LINEAR); + aVCLGradient.SetStyle(GradientStyle_LINEAR); aVCLGradient.SetStartColor(aTransColor); aVCLGradient.SetEndColor(aTransColor); aVCLGradient.SetAngle(0); |