diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/inc/drawattr.hxx | |
parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/inc/drawattr.hxx')
-rw-r--r-- | sc/inc/drawattr.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx index 4fd444c7c531..34e08c975f02 100644 --- a/sc/inc/drawattr.hxx +++ b/sc/inc/drawattr.hxx @@ -39,19 +39,19 @@ public: SvxDrawToolItem( const SvxDrawToolItem& rDrawToolItem ) : SfxEnumItem( rDrawToolItem ){} - SvxDrawToolItem(USHORT nWhichP) : SfxEnumItem(nWhichP){} + SvxDrawToolItem(sal_uInt16 nWhichP) : SfxEnumItem(nWhichP){} virtual String GetValueText() const; - virtual String GetValueText(USHORT nVal) const; - virtual USHORT GetValueCount() const - {return((USHORT)SVX_SNAP_DRAW_TEXT);} + virtual String GetValueText(sal_uInt16 nVal) const; + virtual sal_uInt16 GetValueCount() const + {return((sal_uInt16)SVX_SNAP_DRAW_TEXT);} virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; inline SvxDrawToolItem& operator=(const SvxDrawToolItem& rDrawTool) |