summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2016-05-21 19:15:22 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-23 09:20:31 +0000
commit5c5209c2d9f2626d2c024493a7f9cde9577e6261 (patch)
treea989f18da3fc45114e07f630bc3acd2221098996 /svx
parentfde4ccb0752f4a34b995ee3b0937098c3d189c1b (diff)
Convert GradientStyle to scoped enum
Change-Id: I1da151dd25648e363ba88bf88caa3e820f0ee424 Reviewed-on: https://gerrit.libreoffice.org/25270 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx12
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx14
2 files changed, 13 insertions, 13 deletions
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 97ee4c0175e5..79fdbf9f61fd 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -88,27 +88,27 @@ namespace drawinglayer
{
case css::awt::GradientStyle_LINEAR :
{
- return attribute::GRADIENTSTYLE_LINEAR;
+ return attribute::GradientStyle::Linear;
}
case css::awt::GradientStyle_AXIAL :
{
- return attribute::GRADIENTSTYLE_AXIAL;
+ return attribute::GradientStyle::Axial;
}
case css::awt::GradientStyle_RADIAL :
{
- return attribute::GRADIENTSTYLE_RADIAL;
+ return attribute::GradientStyle::Radial;
}
case css::awt::GradientStyle_ELLIPTICAL :
{
- return attribute::GRADIENTSTYLE_ELLIPTICAL;
+ return attribute::GradientStyle::Elliptical;
}
case css::awt::GradientStyle_SQUARE :
{
- return attribute::GRADIENTSTYLE_SQUARE;
+ return attribute::GradientStyle::Square;
}
default :
{
- return attribute::GRADIENTSTYLE_RECT; // css::awt::GradientStyle_RECT
+ return attribute::GradientStyle::Rect; // css::awt::GradientStyle_RECT
}
}
}
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 5ad61a6f622d..4d9a8b614626 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -122,38 +122,38 @@ Bitmap XGradientList::CreateBitmapForUI( long nIndex )
aEnd = interpolate(aBlack, aEnd, (double)nEndIntens * 0.01);
}
- drawinglayer::attribute::GradientStyle aGradientStyle(drawinglayer::attribute::GRADIENTSTYLE_RECT);
+ drawinglayer::attribute::GradientStyle aGradientStyle(drawinglayer::attribute::GradientStyle::Rect);
switch(rGradient.GetGradientStyle())
{
case css::awt::GradientStyle_LINEAR :
{
- aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_LINEAR;
+ aGradientStyle = drawinglayer::attribute::GradientStyle::Linear;
break;
}
case css::awt::GradientStyle_AXIAL :
{
- aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_AXIAL;
+ aGradientStyle = drawinglayer::attribute::GradientStyle::Axial;
break;
}
case css::awt::GradientStyle_RADIAL :
{
- aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RADIAL;
+ aGradientStyle = drawinglayer::attribute::GradientStyle::Radial;
break;
}
case css::awt::GradientStyle_ELLIPTICAL :
{
- aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_ELLIPTICAL;
+ aGradientStyle = drawinglayer::attribute::GradientStyle::Elliptical;
break;
}
case css::awt::GradientStyle_SQUARE :
{
- aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_SQUARE;
+ aGradientStyle = drawinglayer::attribute::GradientStyle::Square;
break;
}
default :
{
- aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RECT; // css::awt::GradientStyle_RECT
+ aGradientStyle = drawinglayer::attribute::GradientStyle::Rect; // css::awt::GradientStyle_RECT
break;
}
}