diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-09-03 01:38:38 +0200 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-09-06 12:12:31 +0200 |
commit | 6f8a26668e559f3fd4c7699c3ff7acfa3f8f604c (patch) | |
tree | b2e028e60187a997ffb6e0f4864b3d3b2d44cb4c /sw | |
parent | a219bbb62f974020fac0799143fbc51c385bb460 (diff) |
sal_uInt16 to more proper types
Change-Id: I3728f29e6cb869b3b5e27afd2c1dcdf857fd96de
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/text/itradj.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index c113ec1836a4..dc30c603ed18 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -404,7 +404,7 @@ SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent ) pCurrent->SetKanaComp( pNewKana ); const sal_uInt16 nNull = 0; - sal_uInt16 nKanaIdx = 0; + size_t nKanaIdx = 0; long nKanaDiffSum = 0; SwTwips nRepaintOfst = 0; SwTwips nX = 0; @@ -725,8 +725,8 @@ SwFlyPortion *SwTxtAdjuster::CalcFlyPortion( const long nRealWidth, aLocal.Left( nCurrWidth ); // If the rect is wider than the line, we adjust it to the right size - sal_uInt16 nLocalWidth = sal_uInt16( aLocal.Left() + aLocal.Width() ); - if( nRealWidth < long( nLocalWidth ) ) + const long nLocalWidth = aLocal.Left() + aLocal.Width(); + if( nRealWidth < nLocalWidth ) aLocal.Width( nRealWidth - aLocal.Left() ); GetInfo().GetParaPortion()->SetFly( true ); pFlyPortion = new SwFlyPortion( aLocal ); |