diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-09-01 22:45:46 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-09-06 12:12:30 +0200 |
| commit | 4f31a00fd0bec1e083d630e3a642e451f8f1f714 (patch) | |
| tree | 0804504a3063468c21203cc1f14d3d1ae3698eb1 /sw | |
| parent | 7ea772887bee9dde7aeb6fa3673496c7b44f525c (diff) | |
sal_uInt16 to more proper types, constify
Change-Id: Ic587040d62eb02cc2e1907eee2190e0af95d959d
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/itrcrsr.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 7b436dc3338d..05c1d1c63f1c 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -62,7 +62,7 @@ static void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig, if ( rPor.InFldGrp() && !((SwFldPortion&)rPor).GetExp().isEmpty() ) { - const sal_uInt16 nCharOfst = rCMS.pSpecialPos->nCharOfst; + const sal_Int32 nCharOfst = rCMS.pSpecialPos->nCharOfst; sal_Int32 nFldIdx = 0; sal_Int32 nFldLen = 0; @@ -256,7 +256,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf ) break; case SVX_LINE_SPACE_MIN: { - if( nFirstLineOfs < sal_uInt16( pSpace->GetLineHeight() ) ) + if( nFirstLineOfs < pSpace->GetLineHeight() ) nFirstLineOfs = pSpace->GetLineHeight(); break; } @@ -281,7 +281,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf ) nTmp /= 100; if( !nTmp ) ++nTmp; - nFirstLineOfs = (sal_uInt16)nTmp; + nFirstLineOfs = nTmp; break; } case SVX_INTER_LINE_SPACE_FIX: @@ -416,8 +416,8 @@ bool SwTxtCursor::GetEndCharRect( SwRect* pOrig, const sal_Int32 nOfst, // If necessary, as catch up, do the adjustment GetAdjusted(); - sal_uInt16 nX = 0; - sal_uInt16 nLast = 0; + long nX = 0; + long nLast = 0; SwLinePortion *pPor = pCurr->GetFirstPortion(); sal_uInt16 nTmpHeight, nTmpAscent; @@ -1572,7 +1572,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, if( ((SwMultiPortion*)pPor)->HasBrackets() ) { - sal_uInt16 nPreWidth = ((SwDoubleLinePortion*)pPor)->PreWidth(); + const sal_uInt16 nPreWidth = ((SwDoubleLinePortion*)pPor)->PreWidth(); if ( nX > nPreWidth ) nX = nX - nPreWidth; else |