diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-21 19:26:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-23 07:31:31 +0000 |
| commit | 4a98af674c90de499909174af409d0e29cc155e2 (patch) | |
| tree | 1b30c08b36349a937cd137c31189840cf9f587d1 /svx | |
| parent | 72ffb6f590293fb8d3ba428f1700dc05703b014f (diff) | |
Convert HatchStyle to scoped enum
Change-Id: I27878a67457d32e6922dfb6da73f896ff6ab1d01
Reviewed-on: https://gerrit.libreoffice.org/25271
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sdr/overlay/overlaytools.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrattributecreator.cxx | 6 | ||||
| -rw-r--r-- | svx/source/xoutdev/xtabhtch.cxx | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx index e6ba36506944..b7c642a246d3 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx @@ -121,7 +121,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfSdrOle2Obj::c // Use a FillHatchPrimitive2D with necessary attributes const drawinglayer::attribute::FillHatchAttribute aFillHatch( - drawinglayer::attribute::HATCHSTYLE_SINGLE, // single hatch + drawinglayer::attribute::HatchStyle::Single, // single hatch 125.0, // 1.25 mm 45.0 * F_PI180, // 45 degree diagonal Color(COL_BLACK).getBColor(), // black color diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index 0ecaa301f5b8..75bcee0de02b 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -355,7 +355,7 @@ namespace drawinglayer const double fHatchRotation(45 * F_PI180); const double fDiscreteHatchDistance(3.0); const drawinglayer::attribute::FillHatchAttribute aFillHatchAttribute( - drawinglayer::attribute::HATCHSTYLE_SINGLE, + drawinglayer::attribute::HatchStyle::Single, fDiscreteHatchDistance * getDiscreteUnit(), fHatchRotation - getRotation(), aHighContrastLineColor, diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 808bb9e176d7..97ee4c0175e5 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -119,15 +119,15 @@ namespace drawinglayer { case css::drawing::HatchStyle_SINGLE : { - return attribute::HATCHSTYLE_SINGLE; + return attribute::HatchStyle::Single; } case css::drawing::HatchStyle_DOUBLE : { - return attribute::HATCHSTYLE_DOUBLE; + return attribute::HatchStyle::Double; } default : { - return attribute::HATCHSTYLE_TRIPLE; // css::drawing::HatchStyle_TRIPLE + return attribute::HatchStyle::Triple; // css::drawing::HatchStyle_TRIPLE } } } diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index 37a24dbd366d..bb66f709ed75 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -96,23 +96,23 @@ Bitmap XHatchList::CreateBitmapForUI( long nIndex ) basegfx::B2DRange(0.0, 0.0, rSize.Width(), rSize.Height()))); const XHatch& rHatch = GetHatch(nIndex)->GetHatch(); - drawinglayer::attribute::HatchStyle aHatchStyle(drawinglayer::attribute::HATCHSTYLE_TRIPLE); + drawinglayer::attribute::HatchStyle aHatchStyle(drawinglayer::attribute::HatchStyle::Triple); switch(rHatch.GetHatchStyle()) { case css::drawing::HatchStyle_SINGLE : { - aHatchStyle = drawinglayer::attribute::HATCHSTYLE_SINGLE; + aHatchStyle = drawinglayer::attribute::HatchStyle::Single; break; } case css::drawing::HatchStyle_DOUBLE : { - aHatchStyle = drawinglayer::attribute::HATCHSTYLE_DOUBLE; + aHatchStyle = drawinglayer::attribute::HatchStyle::Double; break; } default : { - aHatchStyle = drawinglayer::attribute::HATCHSTYLE_TRIPLE; // css::drawing::HatchStyle_TRIPLE + aHatchStyle = drawinglayer::attribute::HatchStyle::Triple; // css::drawing::HatchStyle_TRIPLE break; } } |