diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-18 18:07:36 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-19 00:30:37 +0200 |
| commit | 1e6ff8f7f8b5322bed7a1b4483f2f483b00212ba (patch) | |
| tree | 13e53997cf5b998859f247cf72b228f1c53cefd9 /include | |
| parent | ab18e62bd7a0a05970323509a2ce22a94c70b7bf (diff) | |
XFillStyle -> css::drawing::FillStyle
Change-Id: I6b2fabd72fd34f4ac1b3a18f386c90794bc39ce4
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/fillctrl.hxx | 5 | ||||
| -rw-r--r-- | include/svx/xenum.hxx | 2 | ||||
| -rw-r--r-- | include/svx/xfillit0.hxx | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index 8825770f5b5d..215ce4de56a8 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -23,6 +23,7 @@ #include <svl/lstner.hxx> #include <sfx2/tbxctrl.hxx> #include <svx/svxdllapi.h> +#include <com/sun/star/drawing/FillStyle.hpp> class XFillStyleItem; class XFillColorItem; @@ -53,7 +54,7 @@ private: SvxFillTypeBox* mpFillTypeLB; SvxFillAttrBox* mpFillAttrLB; - XFillStyle meLastXFS; + css::drawing::FillStyle meLastXFS; /// bitfield bool mbUpdate:1; @@ -93,7 +94,7 @@ private: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; - void InitializeFillStyleAccordingToGivenFillType(XFillStyle eFillStyle); + void InitializeFillStyleAccordingToGivenFillType(css::drawing::FillStyle eFillStyle); void updateLastFillTypeControlSelectEntryPos(); void updateLastFillAttrControlSelectEntryPos(); diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx index c405c4b14927..2f76110f64d8 100644 --- a/include/svx/xenum.hxx +++ b/include/svx/xenum.hxx @@ -23,8 +23,6 @@ enum XLineStyle { XLINE_NONE, XLINE_SOLID, XLINE_DASH }; enum XDashStyle { XDASH_RECT, XDASH_ROUND, XDASH_RECTRELATIVE, XDASH_ROUNDRELATIVE }; -enum XFillStyle { XFILL_NONE, XFILL_SOLID, XFILL_GRADIENT, XFILL_HATCH, - XFILL_BITMAP }; enum XGradientStyle { XGRAD_LINEAR, XGRAD_AXIAL, XGRAD_RADIAL, XGRAD_ELLIPTICAL, XGRAD_SQUARE, XGRAD_RECT }; enum XHatchStyle { XHATCH_SINGLE, XHATCH_DOUBLE, XHATCH_TRIPLE }; diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 51edf4e2e7b0..1c28fc15824d 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -25,6 +25,7 @@ #include <svx/xdef.hxx> #include <svx/xenum.hxx> #include <svx/svxdllapi.h> +#include <com/sun/star/drawing/FillStyle.hpp> // class XFillStyleItem @@ -34,7 +35,7 @@ class SVX_DLLPUBLIC XFillStyleItem : public SfxEnumItem { public: TYPEINFO_OVERRIDE(); - XFillStyleItem(XFillStyle = XFILL_SOLID); + XFillStyleItem(css::drawing::FillStyle = css::drawing::FillStyle_SOLID); XFillStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; @@ -48,7 +49,7 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - XFillStyle GetValue() const { return (XFillStyle) SfxEnumItem::GetValue(); } + css::drawing::FillStyle GetValue() const { return (css::drawing::FillStyle) SfxEnumItem::GetValue(); } }; #endif |