diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-22 12:52:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-22 17:54:06 +0000 |
| commit | e66c1a6f32fa682c60be672020f4ee8890b96a11 (patch) | |
| tree | d74353daaad9b8cef17cca0ed24cb41b3273820e | |
| parent | 44e20713ebcd3b3ed9a490f54b0b17bd6cd57372 (diff) | |
Convert HelplineStyle2D to scoped enum
Change-Id: I32b3c61ed40fe041a395544c1ab32d8e1b5f89fa
Reviewed-on: https://gerrit.libreoffice.org/25297
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | drawinglayer/source/primitive2d/helplineprimitive2d.cxx | 4 | ||||
| -rw-r--r-- | include/drawinglayer/primitive2d/helplineprimitive2d.hxx | 6 | ||||
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx index dc5f8460539e..d51c4db65a52 100644 --- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx @@ -44,7 +44,7 @@ namespace drawinglayer switch(getStyle()) { - default : // HELPLINESTYLE2D_POINT + default : // HelplineStyle2D::Point { const double fViewFixValue(15.0); basegfx::B2DVector aNormalizedDirection(getDirection()); @@ -71,7 +71,7 @@ namespace drawinglayer break; } - case HELPLINESTYLE2D_LINE : + case HelplineStyle2D::Line : { basegfx::B2DPolygon aLine; diff --git a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx index f37cf08ef876..be3a0569054d 100644 --- a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -37,10 +37,10 @@ namespace drawinglayer The available styles of Helplines */ - enum HelplineStyle2D + enum class HelplineStyle2D { - HELPLINESTYLE2D_POINT, - HELPLINESTYLE2D_LINE + Point, + Line }; /** HelplinePrimitive2D class diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx index 27f951fb43e1..37112a956fb4 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx @@ -551,21 +551,21 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageHelplines default : // SDRHELPLINE_POINT { xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D( - aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HELPLINESTYLE2D_POINT, + aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HelplineStyle2D::Point, aRGBColorA, aRGBColorB, fDiscreteDashLength)); break; } case SDRHELPLINE_VERTICAL : { xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D( - aPosition, basegfx::B2DVector(0.0, 1.0), drawinglayer::primitive2d::HELPLINESTYLE2D_LINE, + aPosition, basegfx::B2DVector(0.0, 1.0), drawinglayer::primitive2d::HelplineStyle2D::Line, aRGBColorA, aRGBColorB, fDiscreteDashLength)); break; } case SDRHELPLINE_HORIZONTAL : { xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D( - aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HELPLINESTYLE2D_LINE, + aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HelplineStyle2D::Line, aRGBColorA, aRGBColorB, fDiscreteDashLength)); break; } |