summaryrefslogtreecommitdiff
path: root/forms/source/richtext/rtattributehandler.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'forms/source/richtext/rtattributehandler.cxx')
-rw-r--r--forms/source/richtext/rtattributehandler.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index b56319f33dee..16b98bff7efa 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -122,7 +122,7 @@ namespace frm
{
SvxScriptSetItem aSetItem( (WhichId)getAttributeId(), *_rAttribs.GetPool() );
aSetItem.PutItemForScriptType( _nForScriptType, _rItem );
- _rAttribs.Put( aSetItem.GetItemSet(), FALSE );
+ _rAttribs.Put( aSetItem.GetItemSet(), sal_False );
}
//--------------------------------------------------------------------
@@ -276,7 +276,7 @@ namespace frm
AttributeCheckState LineSpacingHandler::implGetCheckState( const SfxPoolItem& _rItem ) const
{
OSL_ENSURE( _rItem.ISA( SvxLineSpacingItem ), "LineSpacingHandler::implGetCheckState: invalid pool item!" );
- USHORT nLineSpace = static_cast< const SvxLineSpacingItem& >( _rItem ).GetPropLineSpace();
+ sal_uInt16 nLineSpace = static_cast< const SvxLineSpacingItem& >( _rItem ).GetPropLineSpace();
return ( nLineSpace == m_nLineSpace ) ? eChecked : eUnchecked;
}
@@ -291,7 +291,7 @@ namespace frm
if ( 100 == m_nLineSpace )
aLineSpacing.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF;
else
- aLineSpacing.SetPropLineSpace( (BYTE)m_nLineSpace );
+ aLineSpacing.SetPropLineSpace( (sal_uInt8)m_nLineSpace );
_rNewAttribs.Put( aLineSpacing );
}
@@ -399,7 +399,7 @@ namespace frm
if ( pFontHeightItem )
{
// by definition, the item should have the unit twip
- ULONG nHeight = pFontHeightItem->GetHeight();
+ sal_uLong nHeight = pFontHeightItem->GetHeight();
if ( _rAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP )
{
nHeight = OutputDevice::LogicToLogic(
@@ -427,7 +427,7 @@ namespace frm
{
// corect measurement units
SfxMapUnit eItemMapUnit = pFontHeightItem->GetPropUnit(); (void)eItemMapUnit;
- ULONG nHeight = pFontHeightItem->GetHeight();
+ sal_uLong nHeight = pFontHeightItem->GetHeight();
if ( _rNewAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP )
{
nHeight = OutputDevice::LogicToLogic(
@@ -488,7 +488,7 @@ namespace frm
// then we toggle the adjustment, too
SvxAdjust eCurrentAdjustment = SVX_ADJUST_LEFT;
const SfxPoolItem* pCurrentAdjustment = NULL;
- if ( SFX_ITEM_ON == _rCurrentAttribs.GetItemState( EE_PARA_JUST, TRUE, &pCurrentAdjustment ) )
+ if ( SFX_ITEM_ON == _rCurrentAttribs.GetItemState( EE_PARA_JUST, sal_True, &pCurrentAdjustment ) )
eCurrentAdjustment = static_cast< const SvxAdjustItem* >( pCurrentAdjustment )->GetAdjust();
if ( eCurrentAdjustment == m_eOppositeDefaultAdjustment )