summaryrefslogtreecommitdiff
path: root/svx/inc/svx/xbtmpit.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/inc/svx/xbtmpit.hxx')
-rw-r--r--svx/inc/svx/xbtmpit.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx
index 5b0a214b67ed..f835507c3a4c 100644
--- a/svx/inc/svx/xbtmpit.hxx
+++ b/svx/inc/svx/xbtmpit.hxx
@@ -50,16 +50,16 @@ public:
XFillBitmapItem( SfxItemPool* pPool, const XOBitmap& rTheBitmap );
XFillBitmapItem( SfxItemPool* pPool );
XFillBitmapItem( const XFillBitmapItem& rItem );
- XFillBitmapItem( SvStream& rIn, USHORT nVer = 0 );
+ XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer = 0 );
virtual int operator==( const SfxPoolItem& rItem ) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
- virtual SvStream& Store( SvStream& rOut, USHORT nItemVersion ) const;
- virtual USHORT GetVersion( USHORT nFileFormatVersion ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
+ virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
- 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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -69,7 +69,7 @@ public:
const XOBitmap& GetBitmapValue( const XBitmapTable* pTable = 0 ) const; // GetValue -> GetBitmapValue
void SetBitmapValue( const XOBitmap& rNew ) { aXOBitmap = rNew; Detach(); } // SetValue -> SetBitmapValue
- static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+ static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
XFillBitmapItem* checkForUniqueItem( SdrModel* pModel ) const;
};