ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#114441: Convert use of sal_uLong into better integer types

Browse Source 
Change-Id: Ic564411644f9021825f8523af3ec1505352187bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131948
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Tushar Jham
2022-03-24 14:58:11 +01:00
committed by Michael Weghorn
parent 652772ee4e
commit 86fac2109d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editeng/source/editeng/editeng.cxx
+2 -2
View File
@@ -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 );
}
editeng/source/editeng/impedit4.cxx
+2 -2
View File
@@ -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;
}
editeng/source/outliner/outliner.cxx
+1 -1
View File
@@ -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;