ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#114441 convert sal_uLong to other integer types

Browse Source 
nFirstTableCell in both ScHTMLTableStackEntry and ScHTMLLayoutParser has
been turned into size_t because this value was both being converted to
and being compared to elements of type size_t; nRowKey in
ScHTMLLayoutParser::TableOff has been turned into SCROW because this
variable was initialized using two elements of type SCROW

Change-Id: I21edccc663312de75f54b38e95ef4abe49254906
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200921
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
This commit is contained in:
Jesus Solis
2026-08-15 12:35:03 +02:00
committed by Ilmari Lauhakangas
parent 3a0fabe6d9
commit 6b0d2324c9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/source/filter/html/htmlpars.cxx
+2 -2
View File
@@ -1351,7 +1351,7 @@ void ScHTMLLayoutParser::TableOff( const HtmlImportInfo* pInfo )
{ // Outer
for ( SCROW j=0; j < nRowSpan; j++ )
{
sal_uLong nRowKey = nRow + j;
SCROW nRowKey = nRow + j;
SCROW nR = (*pTab1)[ nRowKey ];
if ( !nR )
(*pTab1)[ nRowKey ] = nRowsPerRow1;
@@ -1385,7 +1385,7 @@ void ScHTMLLayoutParser::TableOff( const HtmlImportInfo* pInfo )
}
for ( SCROW j=0; j < nRows; j++ )
{
sal_uLong nRowKey = nRow + j;
SCROW nRowKey = nRow + j;
(*pTab2)[ nRowKey ] = nRowsPerRow2;
}
}
sc/source/filter/inc/htmlpars.hxx
+3 -3
View File
@@ -103,7 +103,7 @@ struct ScHTMLTableStackEntry
ScRangeListRef xLockedList;
std::shared_ptr<ScEEParseEntry> xCellEntry;
std::shared_ptr<ScHTMLColOffset> xLocalColOffset;
sal_uLong nFirstTableCell;
size_t nFirstTableCell;
SCROW nRowCnt;
SCCOL nColCntStart;
SCCOL nMaxCol;
@@ -114,7 +114,7 @@ struct ScHTMLTableStackEntry
bool bFirstRow;
ScHTMLTableStackEntry( std::shared_ptr<ScEEParseEntry> xE,
ScRangeListRef xL, std::shared_ptr<ScHTMLColOffset> xTO,
sal_uLong nFTC,
size_t nFTC,
SCROW nRow,
SCCOL nStart, SCCOL nMax, sal_uInt16 nTab,
sal_uInt16 nTW, sal_uInt16 nCO, sal_uInt16 nCOS,
@@ -162,7 +162,7 @@ private:
std::unique_ptr<OuterMap> pTables;
ScHTMLColOffset maColOffset;
std::shared_ptr<ScHTMLColOffset> xLocalColOffset; // per table
sal_uLong nFirstTableCell; // per table
size_t nFirstTableCell; // per table
short nTableLevel;
sal_uInt16 nTable;
sal_uInt16 nMaxTable;