Kaydet (Commit) 0cd7ccb8 authored tarafından Noel Grandin's avatar Noel Grandin

convert GradientType to scoped enum

Change-Id: Ie71ead122965e967796ed01270cc2824d35905ac
Reviewed-on: https://gerrit.libreoffice.org/35900Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst da56de9a
......@@ -1426,7 +1426,7 @@ namespace drawinglayer
rFillGraphicAttribute.getTiling(),
SvtGraphicFill::hatchSingle,
Color(),
SvtGraphicFill::gradientLinear,
SvtGraphicFill::GradientType::Linear,
Color(),
Color(),
0,
......@@ -1524,7 +1524,7 @@ namespace drawinglayer
false,
eHatch,
Color(rFillHatchAttribute.getColor()),
SvtGraphicFill::gradientLinear,
SvtGraphicFill::GradientType::Linear,
Color(),
Color(),
0,
......@@ -1621,22 +1621,22 @@ namespace drawinglayer
if(!mnSvtGraphicFillCount && aLocalPolyPolygon.count())
{
// setup gradient stuff like in like in impgrfll
SvtGraphicFill::GradientType eGrad(SvtGraphicFill::gradientLinear);
// setup gradient stuff like in impgrfll
SvtGraphicFill::GradientType eGrad(SvtGraphicFill::GradientType::Linear);
switch(aVCLGradient.GetStyle())
{
default : // GradientStyle::Linear:
case GradientStyle::Axial:
eGrad = SvtGraphicFill::gradientLinear;
eGrad = SvtGraphicFill::GradientType::Linear;
break;
case GradientStyle::Radial:
case GradientStyle::Elliptical:
eGrad = SvtGraphicFill::gradientRadial;
eGrad = SvtGraphicFill::GradientType::Radial;
break;
case GradientStyle::Square:
case GradientStyle::Rect:
eGrad = SvtGraphicFill::gradientRectangular;
eGrad = SvtGraphicFill::GradientType::Rectangular;
break;
}
......@@ -1698,7 +1698,7 @@ namespace drawinglayer
false,
SvtGraphicFill::hatchSingle,
Color(),
SvtGraphicFill::gradientLinear,
SvtGraphicFill::GradientType::Linear,
Color(),
Color(),
0,
......@@ -1876,7 +1876,7 @@ namespace drawinglayer
false,
SvtGraphicFill::hatchSingle,
Color(),
SvtGraphicFill::gradientLinear,
SvtGraphicFill::GradientType::Linear,
Color(),
Color(),
0,
......
......@@ -3124,8 +3124,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
ReadSvtGraphicFill( aMemStm, aFill );
bool bGradient = SvtGraphicFill::fillGradient == aFill.getFillType() &&
( SvtGraphicFill::gradientLinear == aFill.getGradientType() ||
SvtGraphicFill::gradientRadial == aFill.getGradientType() );
( SvtGraphicFill::GradientType::Linear == aFill.getGradientType() ||
SvtGraphicFill::GradientType::Radial == aFill.getGradientType() );
bool bSkip = ( SvtGraphicFill::fillSolid == aFill.getFillType() || bGradient );
if( bSkip )
......
......@@ -248,7 +248,7 @@ public:
hatchTriple
};
/// Type of gradient used
enum GradientType {gradientLinear=0, gradientRadial, gradientRectangular};
enum class GradientType {Linear, Radial, Rectangular};
/// Special values for gradient step count
enum { gradientStepsInfinite=0 };
/** Homogeneous 2D transformation matrix
......
......@@ -1263,7 +1263,7 @@ void WinMtfOutput::DrawPolygon( tools::Polygon& rPolygon, bool bRecordPath )
true,
SvtGraphicFill::hatchSingle,
Color(),
SvtGraphicFill::gradientLinear,
SvtGraphicFill::GradientType::Linear,
Color(),
Color(),
0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment