diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-02 10:53:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-05 08:21:46 +0200 |
| commit | 12569802394fb0a9850fcdb0647a0845a803f1ff (patch) | |
| tree | 9f5a626852adbf00378fc3dc80475ad896d957f8 /svx | |
| parent | 933c0679d64a5585ebfd233180a1a818b493eec5 (diff) | |
convert GradientStyle to scoped enum
Change-Id: Ib740da708612df7a5f4b8c82262b9b1bd436604d
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdfmtf.cxx | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index a96ea76afc36..c9a0a072d431 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -1220,7 +1220,7 @@ void AreaPropertyPanelBase::Update() mpLbFillGradTo->SelectEntry(aGradient.GetEndColor()); } mpGradientStyle->SelectEntryPos(sal::static_int_cast< sal_Int32 >( aGradient.GetGradientStyle() )); - if(mpGradientStyle->GetSelectEntryPos() == GradientStyle_RADIAL) + if(mpGradientStyle->GetSelectEntryPos() == (sal_Int32)GradientStyle::Radial) mpMTRAngle->Disable(); else mpMTRAngle->SetValue( aGradient.GetAngle() /10 ); diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index aad00cae4399..a19a53422688 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1357,18 +1357,18 @@ namespace switch(rGradientStyle) { - case GradientStyle_LINEAR: aXGradientStyle = css::awt::GradientStyle_LINEAR; break; - case GradientStyle_AXIAL: aXGradientStyle = css::awt::GradientStyle_AXIAL; break; - case GradientStyle_RADIAL: aXGradientStyle = css::awt::GradientStyle_RADIAL; break; - case GradientStyle_ELLIPTICAL: aXGradientStyle = css::awt::GradientStyle_ELLIPTICAL; break; - case GradientStyle_SQUARE: aXGradientStyle = css::awt::GradientStyle_SQUARE; break; - case GradientStyle_RECT: aXGradientStyle = css::awt::GradientStyle_RECT; break; - - // Needed due to GradientStyle_FORCE_EQUAL_SIZE; this again is needed + case GradientStyle::Linear: aXGradientStyle = css::awt::GradientStyle_LINEAR; break; + case GradientStyle::Axial: aXGradientStyle = css::awt::GradientStyle_AXIAL; break; + case GradientStyle::Radial: aXGradientStyle = css::awt::GradientStyle_RADIAL; break; + case GradientStyle::Elliptical: aXGradientStyle = css::awt::GradientStyle_ELLIPTICAL; break; + case GradientStyle::Square: aXGradientStyle = css::awt::GradientStyle_SQUARE; break; + case GradientStyle::Rect: aXGradientStyle = css::awt::GradientStyle_RECT; break; + + // Needed due to GradientStyle::FORCE_EQUAL_SIZE; this again is needed // to force the enum defines in VCL to a defined size for the compilers, // so despite it is never used it cannot be removed (would break the // API implementation probably). - case GradientStyle_FORCE_EQUAL_SIZE: break; + case GradientStyle::FORCE_EQUAL_SIZE: break; default: break; } |