summaryrefslogtreecommitdiff
path: root/svx/inc/svx/sxmuitm.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/inc/svx/sxmuitm.hxx')
-rw-r--r--svx/inc/svx/sxmuitm.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx
index d8c65975c92a..aeb9dfeec955 100644
--- a/svx/inc/svx/sxmuitm.hxx
+++ b/svx/inc/svx/sxmuitm.hxx
@@ -37,17 +37,17 @@
class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< USHORT >(eUnit)) {}
+ SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {}
SdrMeasureUnitItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREUNIT,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 14; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 14; }
FieldUnit GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); }
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};