diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-19 15:18:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-20 08:04:53 +0200 |
| commit | 1e822e401ea8fe950c7fb62172ac61d8396c98e9 (patch) | |
| tree | 3a29227adfe1c5ec9209d7e7deb2035633104986 /sw/source/core/text/porfld.cxx | |
| parent | b225980d2d65694278c9ed89512fbe21b08febd6 (diff) | |
use tools::Long in sw
Change-Id: I44be72b3a9b14823ec37a3c799cffb4fb4d6e1de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104527
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/text/porfld.cxx')
| -rw-r--r-- | sw/source/core/text/porfld.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 0c77fdcd09d0..963ab8e3910f 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -546,7 +546,7 @@ bool SwNumberPortion::Format( SwTextFormatInfo &rInf ) // SetAscent( rInf.GetAscent() ); OSL_ENSURE( Height() && nAscent, "NumberPortions without Height | Ascent" ); - long nDiff( 0 ); + tools::Long nDiff( 0 ); if ( !mbLabelAlignmentPosAndSpaceModeActive ) { @@ -845,7 +845,7 @@ bool SwGrfNumPortion::Format( SwTextFormatInfo &rInf ) } rInf.SetNumDone( true ); // long nDiff = rInf.Left() - rInf.First() + rInf.ForcedLeftMargin(); - long nDiff = mbLabelAlignmentPosAndSpaceModeActive + tools::Long nDiff = mbLabelAlignmentPosAndSpaceModeActive ? 0 : rInf.Left() - rInf.First() + rInf.ForcedLeftMargin(); // The TextPortion should at least always start on the @@ -891,7 +891,7 @@ void SwGrfNumPortion::Paint( const SwTextPaintInfo &rInf ) const return; } Point aPos( rInf.X() + GRFNUM_SECURE, rInf.Y() - GetRelPos() + GRFNUM_SECURE ); - long nTmpWidth = std::max( long(0), static_cast<long>(nFixWidth - 2 * GRFNUM_SECURE) ); + tools::Long nTmpWidth = std::max( tools::Long(0), static_cast<tools::Long>(nFixWidth - 2 * GRFNUM_SECURE) ); Size aSize( nTmpWidth, GetGrfHeight() - 2 * GRFNUM_SECURE ); const bool bTmpLeft = mbLabelAlignmentPosAndSpaceModeActive || @@ -919,7 +919,7 @@ void SwGrfNumPortion::Paint( const SwTextPaintInfo &rInf ) const if( m_bReplace ) { - const long nTmpH = GetNextPortion() ? GetNextPortion()->GetAscent() : 120; + const tools::Long nTmpH = GetNextPortion() ? GetNextPortion()->GetAscent() : 120; aSize = Size( nTmpH, nTmpH ); aPos.setY( rInf.Y() - nTmpH ); } @@ -998,8 +998,8 @@ void SwGrfNumPortion::Paint( const SwTextPaintInfo &rInf ) const } } -void SwGrfNumPortion::SetBase( long nLnAscent, long nLnDescent, - long nFlyAsc, long nFlyDesc ) +void SwGrfNumPortion::SetBase( tools::Long nLnAscent, tools::Long nLnDescent, + tools::Long nFlyAsc, tools::Long nFlyDesc ) { if ( GetOrient() == text::VertOrientation::NONE ) return; |