diff options
| author | Radu Ioan <ioan.radu.g@gmail.com> | 2014-12-05 20:09:01 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-11 18:31:01 +0100 |
| commit | c69f481d792c7b121479d024cf675f6ddb747422 (patch) | |
| tree | 43f8c056312a1f97ed09c0a309a3c897c74b51b5 /include | |
| parent | fbe9accf36ac4c52ef5bcb84d455b4d06c317668 (diff) | |
fdo#85486 - Clean up unnecessary enumerations from xenum.hxx
Removed XGradientStyle
Reviewed on:
https://gerrit.libreoffice.org/13320
Change-Id: Iff662c05105c3a939104f658f2d0be7d8cb57995
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/xenum.hxx | 2 | ||||
| -rw-r--r-- | include/svx/xgrad.hxx | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx index df659f9a7809..52f7a4f59600 100644 --- a/include/svx/xenum.hxx +++ b/include/svx/xenum.hxx @@ -21,8 +21,6 @@ #define INCLUDED_SVX_XENUM_HXX -enum XGradientStyle { XGRAD_LINEAR, XGRAD_AXIAL, XGRAD_RADIAL, - XGRAD_ELLIPTICAL, XGRAD_SQUARE, XGRAD_RECT }; enum XHatchStyle { XHATCH_SINGLE, XHATCH_DOUBLE, XHATCH_TRIPLE }; enum XFormTextStyle { XFT_ROTATE, XFT_UPRIGHT, XFT_SLANTX, XFT_SLANTY, XFT_NONE }; diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx index b97d0c0d0a6d..9231f915f534 100644 --- a/include/svx/xgrad.hxx +++ b/include/svx/xgrad.hxx @@ -23,6 +23,7 @@ #include <svx/xenum.hxx> #include <tools/color.hxx> #include <svx/svxdllapi.h> +#include <com/sun/star/awt/GradientStyle.hpp> class Gradient; @@ -33,10 +34,10 @@ class Gradient; class SVX_DLLPUBLIC XGradient { protected: - XGradientStyle eStyle; - Color aStartColor; - Color aEndColor; - long nAngle; + css::awt::GradientStyle eStyle; + Color aStartColor; + Color aEndColor; + long nAngle; sal_uInt16 nBorder; sal_uInt16 nOfsX; sal_uInt16 nOfsY; @@ -47,14 +48,14 @@ protected: public: XGradient(); XGradient( const Color& rStart, const Color& rEnd, - XGradientStyle eStyle = XGRAD_LINEAR, long nAngle = 0, + css::awt::GradientStyle eStyle = css::awt::GradientStyle_LINEAR, long nAngle = 0, sal_uInt16 nXOfs = 50, sal_uInt16 nYOfs = 50, sal_uInt16 nBorder = 0, sal_uInt16 nStartIntens = 100, sal_uInt16 nEndIntens = 100, sal_uInt16 nSteps = 0 ); bool operator==(const XGradient& rGradient) const; - void SetGradientStyle(XGradientStyle eNewStyle) { eStyle = eNewStyle; } + void SetGradientStyle(css::awt::GradientStyle eNewStyle) { eStyle = eNewStyle; } void SetStartColor(const Color& rColor) { aStartColor = rColor; } void SetEndColor(const Color& rColor) { aEndColor = rColor; } void SetAngle(long nNewAngle) { nAngle = nNewAngle; } @@ -65,7 +66,7 @@ public: void SetEndIntens(sal_uInt16 nNewIntens) { nIntensEnd = nNewIntens; } void SetSteps(sal_uInt16 nSteps) { nStepCount = nSteps; } - XGradientStyle GetGradientStyle() const { return eStyle; } + css::awt::GradientStyle GetGradientStyle() const { return eStyle; } Color GetStartColor() const { return aStartColor; } Color GetEndColor() const { return aEndColor; } long GetAngle() const { return nAngle; } |