diff options
Diffstat (limited to 'sw/source/core/attr/hints.cxx')
| -rw-r--r-- | sw/source/core/attr/hints.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index 4dc1400c8786..8be07e422fc1 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -66,7 +66,7 @@ SwDelTxt::SwDelTxt( xub_StrLen nS, xub_StrLen nL ) -SwUpdateAttr::SwUpdateAttr( xub_StrLen nS, xub_StrLen nE, USHORT nW ) +SwUpdateAttr::SwUpdateAttr( xub_StrLen nS, xub_StrLen nE, sal_uInt16 nW ) : SwMsgPoolItem( RES_UPDATE_ATTR ), nStart( nS ), nEnd( nE ), @@ -101,7 +101,7 @@ SwTableFmlUpdate::SwTableFmlUpdate( const SwTable* pNewTbl ) eFlags( TBL_CALC ) { DATA.pDelTbl = 0; - bModified = bBehindSplitLine = FALSE; + bModified = bBehindSplitLine = sal_False; OSL_ENSURE( pTbl, "es muss ein Table-Pointer gesetzt werden!" ); } @@ -114,7 +114,7 @@ SwAutoFmtGetDocNode::SwAutoFmtGetDocNode( const SwNodes* pNds ) SwAttrSetChg::SwAttrSetChg( const SwAttrSet& rTheSet, SwAttrSet& rSet ) : SwMsgPoolItem( RES_ATTRSET_CHG ), - bDelSet( FALSE ), + bDelSet( sal_False ), pChgSet( &rSet ), pTheChgdSet( &rTheSet ) {} @@ -122,7 +122,7 @@ SwAttrSetChg::SwAttrSetChg( const SwAttrSet& rTheSet, SwAttrSet& rSet ) SwAttrSetChg::SwAttrSetChg( const SwAttrSetChg& rChgSet ) : SwMsgPoolItem( RES_ATTRSET_CHG ), - bDelSet( TRUE ), + bDelSet( sal_True ), pTheChgdSet( rChgSet.pTheChgdSet ) { pChgSet = new SwAttrSet( *rChgSet.pChgSet ); @@ -138,7 +138,7 @@ SwAttrSetChg::~SwAttrSetChg() #if OSL_DEBUG_LEVEL > 1 -void SwAttrSetChg::ClearItem( USHORT nWhch ) +void SwAttrSetChg::ClearItem( sal_uInt16 nWhch ) { OSL_ENSURE( bDelSet, "der Set darf nicht veraendert werden!" ); pChgSet->ClearItem( nWhch ); @@ -147,7 +147,7 @@ void SwAttrSetChg::ClearItem( USHORT nWhch ) #endif -SwMsgPoolItem::SwMsgPoolItem( USHORT nWhch ) +SwMsgPoolItem::SwMsgPoolItem( sal_uInt16 nWhch ) : SfxPoolItem( nWhch ) {} @@ -155,14 +155,14 @@ SwMsgPoolItem::SwMsgPoolItem( USHORT nWhch ) // "Overhead" vom SfxPoolItem int SwMsgPoolItem::operator==( const SfxPoolItem& ) const { - OSL_ENSURE( FALSE, "SwMsgPoolItem kennt kein ==" ); + OSL_ENSURE( sal_False, "SwMsgPoolItem kennt kein ==" ); return 0; } SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const { - OSL_ENSURE( FALSE, "SwMsgPoolItem kennt kein Clone" ); + OSL_ENSURE( sal_False, "SwMsgPoolItem kennt kein Clone" ); return 0; } @@ -173,7 +173,7 @@ SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const * Used to be inlined (hintids.hxx) in PRODUCT. ******************************************************************************/ #if OSL_DEBUG_LEVEL > 1 -const SfxPoolItem* GetDfltAttr( USHORT nWhich ) +const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich ) { OSL_ASSERT( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN ); @@ -182,7 +182,7 @@ const SfxPoolItem* GetDfltAttr( USHORT nWhich ) return pHt; } #else -const SfxPoolItem* GetDfltAttr( USHORT nWhich ) +const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich ) { return aAttrTab[ nWhich - POOLATTR_BEGIN ]; } @@ -214,7 +214,7 @@ void SwFindNearestNode::CheckNode( const SwNode& rNd ) { if( &pNd->GetNodes() == &rNd.GetNodes() ) { - ULONG nIdx = rNd.GetIndex(); + sal_uLong nIdx = rNd.GetIndex(); if( nIdx < pNd->GetIndex() && ( !pFnd || nIdx > pFnd->GetIndex() ) && nIdx > rNd.GetNodes().GetEndOfExtras().GetIndex() ) @@ -224,20 +224,20 @@ void SwFindNearestNode::CheckNode( const SwNode& rNd ) -USHORT GetWhichOfScript( USHORT nWhich, USHORT nScript ) +sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript ) { - static const USHORT aLangMap[3] = + static const sal_uInt16 aLangMap[3] = { RES_CHRATR_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_LANGUAGE }; - static const USHORT aFontMap[3] = + static const sal_uInt16 aFontMap[3] = { RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT}; - static const USHORT aFontSizeMap[3] = + static const sal_uInt16 aFontSizeMap[3] = { RES_CHRATR_FONTSIZE, RES_CHRATR_CJK_FONTSIZE, RES_CHRATR_CTL_FONTSIZE }; - static const USHORT aWeightMap[3] = + static const sal_uInt16 aWeightMap[3] = { RES_CHRATR_WEIGHT, RES_CHRATR_CJK_WEIGHT, RES_CHRATR_CTL_WEIGHT}; - static const USHORT aPostureMap[3] = + static const sal_uInt16 aPostureMap[3] = { RES_CHRATR_POSTURE, RES_CHRATR_CJK_POSTURE, RES_CHRATR_CTL_POSTURE}; - const USHORT* pM; + const sal_uInt16* pM; switch( nWhich ) { case RES_CHRATR_LANGUAGE: @@ -273,13 +273,13 @@ USHORT GetWhichOfScript( USHORT nWhich, USHORT nScript ) pM = 0; } - USHORT nRet; + sal_uInt16 nRet; if( pM ) { using namespace ::com::sun::star::i18n; { if( ScriptType::WEAK == nScript ) - nScript = GetI18NScriptTypeOfLanguage( (USHORT)GetAppLanguage() ); + nScript = GetI18NScriptTypeOfLanguage( (sal_uInt16)GetAppLanguage() ); switch( nScript) { case ScriptType::COMPLEX: ++pM; // no break; |