diff options
author | Tushar Jham <jhamtushar12@gmail.com> | 2022-03-23 00:45:44 +0530 |
---|---|---|
committer | Michael Weghorn <m.weghorn@posteo.de> | 2022-03-24 14:58:11 +0100 |
commit | 86fac2109d3b5e159628aee6392ecc856fb8a5a6 (patch) | |
tree | 39a1bdcd096fae72ee25621583aaec514f47d0cc /editeng | |
parent | 652772ee4e76ff5d3aa0c599ec0bbe11d7bbee94 (diff) |
tdf#114441: Convert use of sal_uLong into better integer types
Change-Id: Ic564411644f9021825f8523af3ec1505352187bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131948
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit4.cxx | 4 | ||||
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index b557dd693d72..eb7d1ad5a6fa 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -637,14 +637,14 @@ tools::Rectangle EditEngine::GetParaBounds( sal_Int32 nPara ) { sal_Int32 nTextHeight = pImpEditEngine->GetTextHeight(); sal_Int32 nParaWidth = pImpEditEngine->CalcParaWidth( nPara, true ); - sal_uLong nParaHeight = pImpEditEngine->GetParaHeight( nPara ); + sal_Int32 nParaHeight = pImpEditEngine->GetParaHeight( nPara ); return tools::Rectangle( nTextHeight - aPnt.Y() - nParaHeight, 0, nTextHeight - aPnt.Y(), nParaWidth ); } else { sal_Int32 nParaWidth = pImpEditEngine->CalcParaWidth( nPara, true ); - sal_uLong nParaHeight = pImpEditEngine->GetParaHeight( nPara ); + sal_Int32 nParaHeight = pImpEditEngine->GetParaHeight( nPara ); return tools::Rectangle( 0, aPnt.Y(), nParaWidth, aPnt.Y() + nParaHeight ); } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index d2a37e990846..8d7fca6b3885 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -308,8 +308,8 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) { SvxFontItem const*const pFontItem = static_cast<const SvxFontItem*>(pItem); bool bAlreadyExist = false; - sal_uLong nTestMax = nScriptType ? aFontTable.size() : 1; - for ( sal_uLong nTest = 0; !bAlreadyExist && ( nTest < nTestMax ); nTest++ ) + size_t nTestMax = nScriptType ? aFontTable.size() : 1; + for ( size_t nTest = 0; !bAlreadyExist && ( nTest < nTestMax ); nTest++ ) { bAlreadyExist = *aFontTable[ nTest ] == *pFontItem; } diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 41e6ebc4adad..36d2f1ca6999 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -846,7 +846,7 @@ vcl::Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const GetGlobalCharStretching(nStretchX, nStretchY); sal_uInt16 nScale = pFmt->GetBulletRelSize() * nStretchY / 100; - sal_uLong nScaledLineHeight = aStdFont.GetFontSize().Height(); + tools::Long nScaledLineHeight = aStdFont.GetFontSize().Height(); nScaledLineHeight *= nScale*10; nScaledLineHeight /= 1000; |