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/source/ui/view/drawattr.cxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/view/drawattr.cxx')
| -rw-r--r-- | sc/source/ui/view/drawattr.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx index 01809fd60e2e..7067b0d711eb 100644 --- a/sc/source/ui/view/drawattr.cxx +++ b/sc/source/ui/view/drawattr.cxx @@ -42,7 +42,7 @@ String SvxDrawToolItem::GetValueText() const //------------------------------------------------------------------------ -String SvxDrawToolItem::GetValueText( USHORT nVal ) const +String SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const { const sal_Char* p; @@ -72,9 +72,9 @@ SfxPoolItem* SvxDrawToolItem::Clone( SfxItemPool * ) const //------------------------------------------------------------------------ -SfxPoolItem* SvxDrawToolItem::Create( SvStream& rStream, USHORT nVer ) const +SfxPoolItem* SvxDrawToolItem::Create( SvStream& rStream, sal_uInt16 nVer ) const { - USHORT nVal; + sal_uInt16 nVal; rStream >> nVal; return new SvxDrawToolItem(nVal); } |