diff options
Diffstat (limited to 'sw/source/core/text/txtftn.cxx')
| -rw-r--r-- | sw/source/core/text/txtftn.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 74fa31f9237e..9a1fde88724a 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -116,7 +116,7 @@ void SwTxtFrm::CalcFtnFlag( xub_StrLen nStop )//Fuer den Test von SplitFrm if( !pHints ) return; - const USHORT nSize = pHints->Count(); + const sal_uInt16 nSize = pHints->Count(); #ifndef DBG_UTIL const xub_StrLen nEnd = GetFollow() ? GetFollow()->GetOfst() : STRING_LEN; @@ -125,7 +125,7 @@ void SwTxtFrm::CalcFtnFlag( xub_StrLen nStop )//Fuer den Test von SplitFrm : GetFollow() ? GetFollow()->GetOfst() : STRING_LEN; #endif - for ( USHORT i = 0; i < nSize; ++i ) + for ( sal_uInt16 i = 0; i < nSize; ++i ) { const SwTxtAttr *pHt = (*pHints)[i]; if ( pHt->Which() == RES_TXTATR_FTN ) @@ -226,7 +226,7 @@ SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower ) ASSERT( pTabFrm && pRow && pRow->GetUpper()->IsTabFrm(), "Upper of row should be tab" ) - const BOOL bDontSplit = !pTabFrm->IsFollow() && + const sal_Bool bDontSplit = !pTabFrm->IsFollow() && !pTabFrm->IsLayoutSplitAllowed(); SwTwips nMin = 0; @@ -262,7 +262,7 @@ SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower ) if ( pStartFrm->GetDrawObjs() ) { const SwSortedObjs &rObjs = *pStartFrm->GetDrawObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pAnchoredObj = rObjs[i]; SwRect aRect( pAnchoredObj->GetObjRect() ); @@ -450,7 +450,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen ) return; sal_Bool bRollBack = nLen != STRING_LEN; - USHORT nSize = pHints->Count(); + sal_uInt16 nSize = pHints->Count(); xub_StrLen nEnd; SwTxtFrm* pSource; if( bRollBack ) @@ -474,7 +474,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen ) SwFtnBossFrm *pEndBoss = 0; sal_Bool bFtnEndDoc = FTNPOS_CHAPTER == GetNode()->GetDoc()->GetFtnInfo().ePos; - for ( USHORT i = nSize; i; ) + for ( sal_uInt16 i = nSize; i; ) { SwTxtAttr *pHt = pHints->GetTextHint(--i); if ( RES_TXTATR_FTN != pHt->Which() ) @@ -1160,7 +1160,7 @@ xub_StrLen SwTxtFormatter::FormatQuoVadis( const xub_StrLen nOffset ) pQuo->SetAscent( rInf.GetAscent() ); pQuo->Height( rInf.GetTxtHeight() ); pQuo->Format( rInf ); - USHORT nQuoWidth = pQuo->Width(); + sal_uInt16 nQuoWidth = pQuo->Width(); SwLinePortion* pCurrPor = pQuo; while ( rInf.GetRest() ) @@ -1239,12 +1239,12 @@ xub_StrLen SwTxtFormatter::FormatQuoVadis( const xub_StrLen nOffset ) if( nDiff < 0 ) { nLastLeft = pQuo->GetAscent(); - nQuoWidth = (USHORT)(-nDiff + nLastLeft); + nQuoWidth = (sal_uInt16)(-nDiff + nLastLeft); } else { nQuoWidth = 0; - nLastLeft = USHORT(( pQuo->GetAscent() + nDiff ) / 2); + nLastLeft = sal_uInt16(( pQuo->GetAscent() + nDiff ) / 2); } break; } @@ -1331,7 +1331,7 @@ public: SwFtnSave( const SwTxtSizeInfo &rInf, const SwTxtFtn *pTxtFtn, const bool bApplyGivenScriptType, - const BYTE nGivenScriptType ); + const sal_uInt8 nGivenScriptType ); ~SwFtnSave(); }; @@ -1342,7 +1342,7 @@ public: SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf, const SwTxtFtn* pTxtFtn, const bool bApplyGivenScriptType, - const BYTE nGivenScriptType ) + const sal_uInt8 nGivenScriptType ) : pInf( &((SwTxtSizeInfo&)rInf) ) , pFnt( 0 ) , pOld( 0 ) @@ -1500,7 +1500,7 @@ SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &rInfo ) const } // --> OD 2009-01-29 #i98418# -void SwFtnPortion::SetPreferredScriptType( BYTE nPreferredScriptType ) +void SwFtnPortion::SetPreferredScriptType( sal_uInt8 nPreferredScriptType ) { mbPreferredScriptTypeSet = true; mnPreferredScriptType = nPreferredScriptType; @@ -1540,7 +1540,7 @@ sal_Bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf ) SetLen( 0 ); if( bFull ) // dritter Versuch, es langt: jetzt wird gestaucht: - Width( USHORT(rInf.Width() - rInf.X()) ); + Width( sal_uInt16(rInf.Width() - rInf.X()) ); // 8317: keine mehrzeiligen Felder bei QuoVadis und ErgoSum if( rInf.GetRest() ) |