tdf#114441 Replace uses of sal_uLong to better integer types
Use sal_uInt64 for the chart position index in chartarr.cxx to match the parameter type of ScChartPositionMap::GetPosition(). Use sal_uInt32 for local function list indexes in addincol.cxx to match the return type of ScFunctionList::GetCount() and the parameter type of ScFunctionList::GetFunction(). Change-Id: Ibb0507a26ae3592cbe48fb760db174401c8f9ada Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209103 Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Tested-by: Jenkins
This commit is contained in:
committed by
Ilmari Lauhakangas
parent
31beb53f8e
commit
221ddbb48b
@@ -1046,8 +1046,8 @@ static void lcl_UpdateFunctionList( const ScFunctionList& rFunctionList, const S
|
||||
// as used in FillFunctionDescFromData
|
||||
const OUString& aCompare = (bEnglishFunctionNames ? rFuncData.GetUpperEnglish() : rFuncData.GetUpperLocal());
|
||||
|
||||
sal_uLong nCount = rFunctionList.GetCount();
|
||||
for (sal_uLong nPos=0; nPos<nCount; nPos++)
|
||||
sal_uInt32 nCount = rFunctionList.GetCount();
|
||||
for (sal_uInt32 nPos=0; nPos<nCount; nPos++)
|
||||
{
|
||||
const ScFuncDesc* pDesc = rFunctionList.GetFunction( nPos );
|
||||
if ( pDesc && pDesc->mxFuncName && *pDesc->mxFuncName == aCompare )
|
||||
|
||||
@@ -290,7 +290,7 @@ std::unique_ptr<ScMemChart> ScChartArray::CreateMemChartMulti()
|
||||
SCSIZE nCol = 0;
|
||||
SCSIZE nRow = 0;
|
||||
bool bCalcAsShown = rDocument.GetDocOptions().IsCalcAsShown();
|
||||
sal_uLong nIndex = 0;
|
||||
sal_uInt64 nIndex = 0;
|
||||
if (bValidData)
|
||||
{
|
||||
for ( nCol = 0; nCol < nColCount; nCol++ )
|
||||
|
||||
Reference in New Issue
Block a user