diff options
Diffstat (limited to 'sw/source/core/text/porfly.cxx')
| -rw-r--r-- | sw/source/core/text/porfly.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index cc4f060d5f86..d2792e3bad68 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -76,7 +76,7 @@ sal_Bool SwFlyPortion::Format( SwTxtFormatInfo &rInf ) // Der Glue wird aufgespannt. rInf.GetLast()->FormatEOL( rInf ); - PrtWidth( static_cast<USHORT>(Fix() - rInf.X() + PrtWidth()) ); + PrtWidth( static_cast<sal_uInt16>(Fix() - rInf.X() + PrtWidth()) ); if( !Width() ) { ASSERT( Width(), "+SwFlyPortion::Format: a fly is a fly is a fly" ); @@ -99,7 +99,7 @@ sal_Bool SwFlyPortion::Format( SwTxtFormatInfo &rInf ) SetLen( 1 ); } - const USHORT nNewWidth = static_cast<USHORT>(rInf.X() + PrtWidth()); + const sal_uInt16 nNewWidth = static_cast<sal_uInt16>(rInf.X() + PrtWidth()); if( rInf.Width() <= nNewWidth ) { Truncate(); @@ -129,7 +129,7 @@ sal_Bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf ) // KerningPortions at beginning of line, e.g., for grid layout // must be considered. const SwLinePortion* pLastPor = rInf.GetLast(); - const USHORT nLeft = ( pLastPor && + const sal_uInt16 nLeft = ( pLastPor && ( pLastPor->IsKernPortion() || pLastPor->IsErgoSumPortion() ) ) ? pLastPor->Width() : @@ -209,7 +209,7 @@ xub_StrLen SwTxtFrm::CalcFlyPos( SwFrmFmt* pSearch ) if( !pHints ) return STRING_LEN; SwTxtAttr* pFound = NULL; - for ( USHORT i = 0; i < pHints->Count(); i++) + for ( sal_uInt16 i = 0; i < pHints->Count(); i++) { SwTxtAttr *pHt = pHints->GetTextHint( i ); if( RES_TXTATR_FLYCNT == pHt->Which() ) @@ -408,14 +408,14 @@ void SwFlyCntPortion::SetBase( const SwTxtFrm& rFrm, const Point &rBase, SwTwips nRelPos = aObjPositioning.GetRelPosY(); if ( nRelPos < 0 ) { - nAscent = static_cast<USHORT>(-nRelPos); + nAscent = static_cast<sal_uInt16>(-nRelPos); if( nAscent > Height() ) Height( nAscent ); } else { nAscent = 0; - Height( Height() + static_cast<USHORT>(nRelPos) ); + Height( Height() + static_cast<sal_uInt16>(nRelPos) ); } } else |