diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-15 09:20:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-15 09:54:14 +0000 |
| commit | 739d98d541c5353a136b7b738ef41a4540e08cde (patch) | |
| tree | baa5ee5732cf21d77e218a3ff6560139632a6676 /include | |
| parent | 227e7bf0dba4d3fa992b3ee96f182ffb94591854 (diff) | |
replace SdrMeasureTextHPos with css::drawing::MeasureTextHorzPos
cause they are cast to each other freely and the css one isn't going to change
value by accident, like has happened to its sibling SdrMeasureTextVPos
recently.
Change-Id: Idb0558553a7bc8337603b7b01df4a597363fcb6d
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/sxmtpitm.hxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index f0c6ff994cf7..3caf61fb9966 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -22,8 +22,8 @@ #include <svx/svddef.hxx> #include <svl/eitem.hxx> #include <svx/svxdllapi.h> +#include <com/sun/star/drawing/MeasureTextHorzPos.hpp> -enum class SdrMeasureTextHPos { Auto, LeftOutside, Inside, RightOutside }; enum class SdrMeasureTextVPos { Auto, Above, Below, VerticalCentered }; @@ -31,12 +31,15 @@ enum class SdrMeasureTextVPos { Auto, Above, Below, VerticalCentered }; class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem { public: - SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SdrMeasureTextHPos::Auto): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} + SdrMeasureTextHPosItem(css::drawing::MeasureTextHorzPos ePos = css::drawing::MeasureTextHorzPos::MeasureTextHorzPos_AUTO) + : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) + { + } 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; } - SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); } + css::drawing::MeasureTextHorzPos GetValue() const { return (css::drawing::MeasureTextHorzPos)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; |