summaryrefslogtreecommitdiff
path: root/svx/source/mnuctrls/fntszctl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/mnuctrls/fntszctl.cxx')
-rw-r--r--svx/source/mnuctrls/fntszctl.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index 48c1a1158c4c..32933ae8b716 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -67,7 +67,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen )
return 0;
const SfxItemPool& rPool = pSh->GetPool();
- USHORT nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
+ sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
const SfxMapUnit eUnit = rPool.GetMetric( nWhich );
long nH = LOGIC( pMen->GetCurHeight(), MAP_POINT, (MapUnit)eUnit ) / 10;
SvxFontHeightItem aItem( nH, 100, GetId() );
@@ -87,7 +87,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen )
void SvxFontSizeMenuControl::StateChanged(
- USHORT, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState );
@@ -110,7 +110,7 @@ void SvxFontSizeMenuControl::StateChanged(
return;
const SfxItemPool& rPool = pSh->GetPool();
- USHORT nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
+ sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
const SfxMapUnit eUnit = rPool.GetMetric( nWhich );
long nH = pItem->GetHeight() * 10;
nVal = LOGIC( nH, (MapUnit)eUnit, MAP_POINT );
@@ -169,7 +169,7 @@ void SvxFontSizeMenuControl::StateChanged(
SvxFontSizeMenuControl::SvxFontSizeMenuControl
(
- USHORT _nId,
+ sal_uInt16 _nId,
Menu& rMenu,
SfxBindings& rBindings
) :