diff options
Diffstat (limited to 'sw/source/core/text/itrtxt.cxx')
| -rw-r--r-- | sw/source/core/text/itrtxt.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx index 9ea46606945a..798faee0d58d 100644 --- a/sw/source/core/text/itrtxt.cxx +++ b/sw/source/core/text/itrtxt.cxx @@ -303,9 +303,9 @@ const SwLineLayout *SwTxtCursor::CharCrsrToLine( const xub_StrLen nPosition ) * SwTxtCrsr::AdjustBaseLine() *************************************************************************/ -USHORT SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine, +sal_uInt16 SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine, const SwLinePortion* pPor, - USHORT nPorHeight, USHORT nPorAscent, + sal_uInt16 nPorHeight, sal_uInt16 nPorAscent, const sal_Bool bAutoToCentered ) const { if ( pPor ) @@ -314,14 +314,14 @@ USHORT SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine, nPorAscent = pPor->GetAscent(); } - USHORT nOfst = rLine.GetRealHeight() - rLine.Height(); + sal_uInt16 nOfst = rLine.GetRealHeight() - rLine.Height(); GETGRID( pFrm->FindPageFrm() ) const sal_Bool bHasGrid = pGrid && GetInfo().SnapToGrid(); if ( bHasGrid ) { - const USHORT nRubyHeight = pGrid->GetRubyHeight(); + const sal_uInt16 nRubyHeight = pGrid->GetRubyHeight(); const sal_Bool bRubyTop = ! pGrid->GetRubyTextBelow(); if ( GetInfo().IsMulti() ) @@ -341,8 +341,8 @@ USHORT SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine, // centered inside the whole line. //for text refactor - const USHORT nLineNetto = rLine.Height() - nRubyHeight; - //const USHORT nLineNetto = ( nPorHeight > nGridWidth ) ? + const sal_uInt16 nLineNetto = rLine.Height() - nRubyHeight; + //const sal_uInt16 nLineNetto = ( nPorHeight > nGridWidth ) ? // rLine.Height() - nRubyHeight : // nGridWidth; nOfst += ( nLineNetto - nPorHeight ) / 2; @@ -445,13 +445,13 @@ void SwTxtIter::TruncLines( sal_Bool bNoteFollow ) SwpHints* pTmpHints = GetTxtFrm()->GetTxtNode()->GetpSwpHints(); // examine hints in range nEnd - (nEnd + nRangeChar) - for( USHORT i = 0; i < pTmpHints->Count(); i++ ) + for( sal_uInt16 i = 0; i < pTmpHints->Count(); i++ ) { const SwTxtAttr* pHt = pTmpHints->GetTextHint( i ); if( RES_TXTATR_FLYCNT == pHt->Which() ) { // check, if hint is in our range - const USHORT nTmpPos = *pHt->GetStart(); + const sal_uInt16 nTmpPos = *pHt->GetStart(); if ( nEnd <= nTmpPos && nTmpPos < nRangeEnd ) pFollow->_InvalidateRange( SwCharRange( nTmpPos, nTmpPos ), 0 ); |