diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-15 09:52:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-15 09:54:14 +0000 |
| commit | 933c85431d57139a60751b4132155f42d62da64b (patch) | |
| tree | 36cbc48b9b40a052c45d5da796c7d8e7214980c5 /include | |
| parent | 739d98d541c5353a136b7b738ef41a4540e08cde (diff) | |
replace SdrMeasureTextVPos with css::drawing::MeasureTextVertPos
cause we freely cast from SdrMeasureTextVPos to MeasureTextVertPos and
since...
commit b0a23c4c35f90ce3cf6a18a37fe141eb33cd5c57
Date: Mon Feb 13 11:06:07 2017 +0200
remove unused BreakedLine enumerator from SdrMeasureTextVPos
the numbers don't match eachother anymore
Change-Id: Ie4a22179c5f5b7d08af8c1a973b6c64cda83681d
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/sxmtpitm.hxx | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 3caf61fb9966..fc9abf85dcfd 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -23,19 +23,19 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> #include <com/sun/star/drawing/MeasureTextHorzPos.hpp> - -enum class SdrMeasureTextVPos { Auto, Above, Below, VerticalCentered }; - +#include <com/sun/star/drawing/MeasureTextVertPos.hpp> // class SdrMeasureTextHPosItem - class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem { public: SdrMeasureTextHPosItem(css::drawing::MeasureTextHorzPos ePos = css::drawing::MeasureTextHorzPos::MeasureTextHorzPos_AUTO) - : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) + : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, sal::static_int_cast<sal_uInt16>(ePos)) + { + } + SdrMeasureTextHPosItem(SvStream& rIn) + : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, rIn) { } - SdrMeasureTextHPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } @@ -48,17 +48,21 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; - // class SdrMeasureTextVPosItem - class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem { public: - SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SdrMeasureTextVPos::Auto): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} - SdrMeasureTextVPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn) {} + SdrMeasureTextVPosItem(css::drawing::MeasureTextVertPos ePos = css::drawing::MeasureTextVertPos_AUTO) + : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, sal::static_int_cast<sal_uInt16>(ePos)) + { + } + SdrMeasureTextVPosItem(SvStream& rIn) + : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, rIn) + { + } virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } - SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); } + css::drawing::MeasureTextVertPos GetValue() const { return (css::drawing::MeasureTextVertPos)SfxEnumItem::GetValue(); } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; |