svx/source/svdraw/svdfmtf.cxx | 6 +++---
svx/source/svdraw/svdfmtf.hxx | 2 +-
svx/source/svdraw/svdmark.cxx | 4 ++--
svx/source/svdraw/svdview.cxx | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit e3d03fa00d49c164ec235d77c827109eac522623
Author: AmosAidoo <aidooamo...@gmail.com>
AuthorDate: Mon Jan 22 20:18:14 2024 +0100
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Tue Jan 23 08:04:55 2024 +0100
tdf#114441 convert sal_uLong to appropriate types
svdfmtf.cxx and .hxx
GetActionSize returns a size_t value
The parameter 'a' is compared to a size_t value
svdmark.cxx
GetOrdNum returns a sal_uInt32 value
svdview.cxx
GetLineCount returns a sal_uInt32 value
Change-Id: I85a0303742607208fdbfb7783e7254847720a2c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162416
Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 923c40a550fa..0ea228dc4c28 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -114,9 +114,9 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(
void ImpSdrGDIMetaFileImport::DoLoopActions(GDIMetaFile const & rMtf,
SvdProgressInfo* pProgrInfo, sal_uInt32* pActionsToReport)
{
- const sal_uLong nCount(rMtf.GetActionSize());
+ const size_t nCount = rMtf.GetActionSize();
- for(sal_uLong a(0); a < nCount; a++)
+ for(size_t a = 0; a < nCount; a++)
{
MetaAction* pAct = rMtf.GetAction(a);
@@ -1219,7 +1219,7 @@ void ImpSdrGDIMetaFileImport::MapScaling()
}
-void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction const & rAct,
GDIMetaFile const & rMtf, sal_uLong& a) // GDIMetaFile* pMtf )
+void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction const & rAct,
GDIMetaFile const & rMtf, size_t& a) // GDIMetaFile* pMtf )
{
bool aSkipComment = false;
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index 31c325582799..6011293cfe92 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -121,7 +121,7 @@ class ImpSdrGDIMetaFileImport final
// #i125211# The MetaCommentAction needs to advance (if used), thus
// give current metafile and index which may be changed
- void DoAction(MetaCommentAction const & rAct, GDIMetaFile const & rMtf,
sal_uLong& a);
+ void DoAction(MetaCommentAction const & rAct, GDIMetaFile const & rMtf,
size_t& a);
// missing actions added
void DoAction(MetaTextRectAction const & rAct);
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index c6151ccfd89d..fc5d815ab9a2 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -292,8 +292,8 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool
bChkSort)
if(pLastOL == pNewOL)
{
- const sal_uLong nLastNum(pLastObj!=nullptr ?
pLastObj->GetOrdNum() : 0);
- const sal_uLong nNewNum(pNewObj !=nullptr ? pNewObj
->GetOrdNum() : 0);
+ const sal_uInt32 nLastNum(pLastObj!=nullptr ?
pLastObj->GetOrdNum() : 0);
+ const sal_uInt32 nNewNum(pNewObj !=nullptr ? pNewObj
->GetOrdNum() : 0);
if(nNewNum < nLastNum)
{
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index f88363268c69..c2a919924464 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1244,7 +1244,7 @@ OUString SdrView::GetStatusText()
// At the end of a line of any multi-line paragraph, we display the
// position of the next line of the same paragraph, if there is one.
sal_uInt16 nParaLine = 0;
- sal_uLong nParaLineCount =
mpTextEditOutliner->GetLineCount(aSel.nEndPara);
+ sal_uInt32 nParaLineCount =
mpTextEditOutliner->GetLineCount(aSel.nEndPara);
bool bBrk = false;
while (!bBrk)
{
