diff options
| author | Radu Ioan <ioan.radu.g@gmail.com> | 2014-12-11 23:45:38 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-12 20:22:15 +0000 |
| commit | 3c77eba67b61b4f78f2c8ccec6c78622ee173b61 (patch) | |
| tree | 2d369a54b91d7a7fed0bf9d51dc3c29e55a21620 /include | |
| parent | e570cd7a293ceee175949dcc9656cdf776ae3c37 (diff) | |
fdo#85486 - Clean up unnecessary enumerations from xenum.hxx
Removed XHatchStyle
Change-Id: I89e7edadc4f408e5a50840aaa1a13965b8503afb
Reviewed-on: https://gerrit.libreoffice.org/13442
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/xenum.hxx | 1 | ||||
| -rw-r--r-- | include/svx/xhatch.hxx | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx index 52f7a4f59600..a849bc56df50 100644 --- a/include/svx/xenum.hxx +++ b/include/svx/xenum.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_XENUM_HXX -enum XHatchStyle { XHATCH_SINGLE, XHATCH_DOUBLE, XHATCH_TRIPLE }; enum XFormTextStyle { XFT_ROTATE, XFT_UPRIGHT, XFT_SLANTX, XFT_SLANTY, XFT_NONE }; enum XFormTextAdjust { XFT_LEFT, XFT_RIGHT, XFT_AUTOSIZE, XFT_CENTER }; diff --git a/include/svx/xhatch.hxx b/include/svx/xhatch.hxx index 9dc725d84354..52010cd5f71f 100644 --- a/include/svx/xhatch.hxx +++ b/include/svx/xhatch.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_SVX_XHATCH_HXX #define INCLUDED_SVX_XHATCH_HXX -#include <svx/xenum.hxx> #include <tools/color.hxx> #include <svx/svxdllapi.h> +#include <com/sun/star/drawing/HatchStyle.hpp> // class XHatch @@ -31,24 +31,24 @@ class SVX_DLLPUBLIC XHatch { protected: - XHatchStyle eStyle; + css::drawing::HatchStyle eStyle; Color aColor; long nDistance; long nAngle; public: - XHatch() : eStyle(XHATCH_SINGLE), nDistance(0), nAngle(0) {} - XHatch(const Color& rCol, XHatchStyle eStyle = XHATCH_SINGLE, + XHatch() : eStyle(css::drawing::HatchStyle_SINGLE), nDistance(0), nAngle(0) {} + XHatch(const Color& rCol, css::drawing::HatchStyle eStyle = css::drawing::HatchStyle_SINGLE, long nDistance = 20, long nAngle = 0); bool operator==(const XHatch& rHatch) const; - void SetHatchStyle(XHatchStyle eNewStyle) { eStyle = eNewStyle; } + void SetHatchStyle(css::drawing::HatchStyle eNewStyle) { eStyle = eNewStyle; } void SetColor(const Color& rColor) { aColor = rColor; } void SetDistance(long nNewDistance) { nDistance = nNewDistance; } void SetAngle(long nNewAngle) { nAngle = nNewAngle; } - XHatchStyle GetHatchStyle() const { return eStyle; } + css::drawing::HatchStyle GetHatchStyle() const { return eStyle; } Color GetColor() const { return aColor; } long GetDistance() const { return nDistance; } long GetAngle() const { return nAngle; } |