diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-16 12:44:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-17 06:04:30 +0000 |
| commit | f2a873cd13adf0b74d18af203676f2de86d1cb2e (patch) | |
| tree | 8b0f044b217e86db3c7320855e4df133fbabf3ae /include/drawinglayer | |
| parent | 1bffa5e110772a7d6183ac64e56c23f2c3019f93 (diff) | |
convert SvxBorderStyle to scoped enum
and rename to SvxBorderLineStyle
Change-Id: I19e530f162e4ca6290a0ad076e7fe3d5775ae6bc
Reviewed-on: https://gerrit.libreoffice.org/35265
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/drawinglayer')
| -rw-r--r-- | include/drawinglayer/primitive2d/borderlineprimitive2d.hxx | 9 | ||||
| -rw-r--r-- | include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index bd10add60aa9..4ac0a1045585 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -27,8 +27,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <com/sun/star/table/BorderLineStyle.hpp> - +enum class SvxBorderLineStyle : sal_Int16; namespace drawinglayer { @@ -66,7 +65,7 @@ namespace drawinglayer basegfx::BColor maRGBColorGap; bool mbHasGapColor; - short mnStyle; + SvxBorderLineStyle mnStyle; double mfPatternScale; @@ -107,7 +106,7 @@ namespace drawinglayer const basegfx::BColor& rRGBColorLeft, const basegfx::BColor& rRGBColorGap, bool bHasGapColor, - const short nStyle, + SvxBorderLineStyle nStyle, double fPatternScale = 1.0 ); /// data read access @@ -124,7 +123,7 @@ namespace drawinglayer const basegfx::BColor& getRGBColorLeft () const { return maRGBColorLeft; } const basegfx::BColor& getRGBColorGap () const { return maRGBColorGap; } bool hasGapColor( ) const { return mbHasGapColor; } - short getStyle () const { return mnStyle; } + SvxBorderLineStyle getStyle () const { return mnStyle; } double getPatternScale() const { return mfPatternScale; } /// Same as create2DDecomposition(), but can do pixel correction if requested. void createDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation, bool bPixelCorrection) const; diff --git a/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx index 5b4a1414f747..3fe2813be9a9 100644 --- a/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx @@ -46,7 +46,7 @@ namespace drawinglayer const basegfx::BColor& rRGBColorLeft, const basegfx::BColor& rRGBColorGap, bool bHasGapColor, - const short nStyle, + SvxBorderLineStyle nStyle, double fPatternScale ); /// compare operator |