From e8c07076689d593b9d2863d166b1933ecb6f480a Mon Sep 17 00:00:00 2001 From: Pelin Kuran Date: Tue, 28 Jan 2020 16:03:55 +0300 Subject: tdf#114441: Convert use of sal_uLong to better integer types Change-Id: I29b3b76dcc7960938155be768ed110c090607fbd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87619 Tested-by: Jenkins Reviewed-by: Michael Stahl --- reportdesign/inc/RptPage.hxx | 2 +- reportdesign/source/core/sdr/RptPage.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index d8ff7fc9d176..1c0f77b0adeb 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -62,7 +62,7 @@ public: /** returns the index inside the object list which belongs to the report component. @param _xObject the report component */ - sal_uLong getIndexOf(const css::uno::Reference< css::report::XReportComponent >& _xObject); + size_t getIndexOf(const css::uno::Reference< css::report::XReportComponent >& _xObject); /** removes the SdrObject which belongs to the report component. @param _xObject the report component diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index 743ebb98140d..24931fe3286f 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -54,7 +54,7 @@ SdrPage* OReportPage::CloneSdrPage(SdrModel& rTargetModel) const } -sal_uLong OReportPage::getIndexOf(const uno::Reference< report::XReportComponent >& _xObject) +size_t OReportPage::getIndexOf(const uno::Reference< report::XReportComponent >& _xObject) { const size_t nCount = GetObjCount(); size_t i = 0; @@ -67,12 +67,12 @@ sal_uLong OReportPage::getIndexOf(const uno::Reference< report::XReportComponent break; } } - return static_cast(i); + return i; } void OReportPage::removeSdrObject(const uno::Reference< report::XReportComponent >& _xObject) { - sal_uLong nPos = getIndexOf(_xObject); + size_t nPos = getIndexOf(_xObject); if ( nPos < GetObjCount() ) { OObjectBase* pBase = dynamic_cast(GetObj(nPos)); @@ -110,7 +110,7 @@ void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& OSL_ENSURE(_xObject.is(),"Object is not valid to create a SdrObject!"); if ( !_xObject.is() ) return; - sal_uLong nPos = getIndexOf(_xObject); + size_t nPos = getIndexOf(_xObject); if ( nPos < GetObjCount() ) return; // Object already in list -- cgit