diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-08-31 12:36:59 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-09-06 12:12:26 +0200 |
| commit | 698ee302a289c1cd5581b4415f06ade8af448c0e (patch) | |
| tree | 876f2e0998d536a99475f7c85f25cf5ec86bea04 /sw | |
| parent | e510bd6362d748bb7347fc3e487945fad852195f (diff) | |
sal_uInt16 to more proper types
Change-Id: I2ad19b46825650f448f921e2bbc1b71ec6314be8
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/txtdrop.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index ef53b01292cb..27e713aa6a9d 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -297,7 +297,7 @@ void SwDropPortion::PaintDrop( const SwTxtPaintInfo &rInf ) const const sal_uInt16 nOldWidth = Width(); const sal_uInt16 nOldAscent = GetAscent(); const SwTwips nOldPosY = rInf.Y(); - const sal_uInt16 nOldPosX = (sal_uInt16)rInf.X(); + const SwTwips nOldPosX = rInf.X(); const SwParaPortion *pPara = rInf.GetParaPortion(); const Point aOutPos( nOldPosX + nX, nOldPosY - pPara->GetAscent() - pPara->GetRealHeight() + pPara->Height() ); @@ -609,7 +609,7 @@ void SwTxtPainter::PaintDropPortion() // MarginPortion und Adjustment! const SwLinePortion *pPor = pCurr->GetFirstPortion(); - sal_uInt16 nX = 0; + long nX = 0; while( pPor && !pPor->IsDropPortion() ) { nX = nX + pPor->Width(); @@ -759,8 +759,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf ) SwFont& rFnt = pCurrPart->GetFont(); // Get height including proportion - const sal_uInt16 nCurrHeight = - (sal_uInt16)rFnt.GetHeight( rFnt.GetActual() ); + const long nCurrHeight = rFnt.GetHeight( rFnt.GetActual() ); // Get without proportion const sal_uInt8 nOldProp = rFnt.GetPropr(); |