core.git: Branch 'distro/collabora/co-23.05' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/filter/html/htmlpars.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e386c96f1624bc453717c9a2457fd18664fea8d7
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Apr 3 14:09:53 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Apr 5 08:57:24 2024 +0200

    ofz#67815 overflowed short
    
    Change-Id: Iee9a5caee53b522ed16d234c2bc06987264e23db
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165751
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit c4f2a85bc5fa319a84474191275a2434dda1830b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165761
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sc/source/filter/html/htmlpars.cxx 
b/sc/source/filter/html/htmlpars.cxx
index d1fcdf335a82..e65b495993ef 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -832,12 +832,12 @@ void ScHTMLLayoutParser::SetWidths()
                         pWidths[nCol] = nW;
                 }
             }
-            for (SCCOL nCol = 1; nCol <= nColsPerRow; nCol++)
+            for (int nCol = 1; nCol <= nColsPerRow; nCol++)
             {
                 pOffsets[nCol] = pOffsets[nCol-1] + pWidths[nCol-1];
             }
             pLocalColOffset->clear();
-            for (SCCOL nCol = 0; nCol <= nColsPerRow; nCol++)
+            for (int nCol = 0; nCol <= nColsPerRow; nCol++)
             {
                 MakeColNoRef( pLocalColOffset, pOffsets[nCol], 0, 0, 0 );
             }