diff options
Diffstat (limited to 'sd/source/ui/func/bulmaper.cxx')
-rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/bulmaper.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 7eeaa63cb38a..de4c7968fbe3 100644..100755 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -62,8 +62,8 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& rSet ) { - const USHORT nCount = aNumRule.GetLevelCount(); - for( USHORT nLevel = 0; nLevel < nCount; nLevel++ ) + const sal_uInt16 nCount = aNumRule.GetLevelCount(); + for( sal_uInt16 nLevel = 0; nLevel < nCount; nLevel++ ) { const SvxNumberFormat& rSrcLevel = aNumRule.GetLevel(nLevel); SvxNumberFormat aNewLevel( rSrcLevel ); @@ -97,22 +97,22 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& Font aMyFont; const SvxFontItem& rFItem = - (SvxFontItem&)rSet.Get(GetWhich( (USHORT)nFontID )); + (SvxFontItem&)rSet.Get(GetWhich( (sal_uInt16)nFontID )); aMyFont.SetFamily(rFItem.GetFamily()); aMyFont.SetName(rFItem.GetFamilyName()); aMyFont.SetCharSet(rFItem.GetCharSet()); aMyFont.SetPitch(rFItem.GetPitch()); const SvxFontHeightItem& rFHItem = - (SvxFontHeightItem&)rSet.Get(GetWhich( (USHORT)nFontHeightID )); + (SvxFontHeightItem&)rSet.Get(GetWhich( (sal_uInt16)nFontHeightID )); aMyFont.SetSize(Size(0, rFHItem.GetHeight())); const SvxWeightItem& rWItem = - (SvxWeightItem&)rSet.Get(GetWhich( (USHORT)nWeightID )); + (SvxWeightItem&)rSet.Get(GetWhich( (sal_uInt16)nWeightID )); aMyFont.SetWeight(rWItem.GetWeight()); const SvxPostureItem& rPItem = - (SvxPostureItem&)rSet.Get(GetWhich( (USHORT)nPostureID )); + (SvxPostureItem&)rSet.Get(GetWhich( (sal_uInt16)nPostureID )); aMyFont.SetItalic(rPItem.GetPosture()); const SvxUnderlineItem& rUItem = (SvxUnderlineItem&)rSet.Get(GetWhich(SID_ATTR_CHAR_UNDERLINE)); |