core.git: Branch 'libreoffice-24-2' - svx/source

[Noel Grandin (via logerrit)]

 svx/source/dialog/framelinkarray.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ab69de0e0aa0c9e48355c9db36c8aa9b93f235d4
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue May 14 09:08:16 2024 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri May 17 13:34:44 2024 +0200

    tdf#161019 tdf#159846 spreadsheet border rendering
    
    regression from
        commit e27d4cc31e04be4c47b5085dfa2363ee45457e8a
        Author: Noel Grandin <noel.gran...@collabora.co.uk>
        Date:   Mon Jun 19 12:23:55 2023 +0200
        tdf#150534 reduce the memory consumption of cells when calculating
    
    Change-Id: Id8b52a3a0880bbb6a7aff28f55bcd57cb1cae048
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167617
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit 6f8a73a379d97829080367b21d54f9b5fab781c9)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167682
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/svx/source/dialog/framelinkarray.cxx 
b/svx/source/dialog/framelinkarray.cxx
index fa5829438698..897012611151 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -936,7 +936,7 @@ void Array::SetAddMergedLeftSize( sal_Int32 nCol, sal_Int32 
nRow, sal_Int32 nAdd
             return;
         Cell aTempCell(*pTempCell);
         aTempCell.mnAddLeft = nAddSize;
-        mxImpl->PutCell( nCol, nRow, aTempCell );
+        mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
     }
 }
 
@@ -951,7 +951,7 @@ void Array::SetAddMergedRightSize( sal_Int32 nCol, 
sal_Int32 nRow, sal_Int32 nAd
             return;
         Cell aTempCell(*pTempCell);
         aTempCell.mnAddRight = nAddSize;
-        mxImpl->PutCell( nCol, nRow, aTempCell );
+        mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
     }
 }
 
@@ -966,7 +966,7 @@ void Array::SetAddMergedTopSize( sal_Int32 nCol, sal_Int32 
nRow, sal_Int32 nAddS
             return;
         Cell aTempCell(*pTempCell);
         aTempCell.mnAddTop = nAddSize;
-        mxImpl->PutCell( nCol, nRow, aTempCell );
+        mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
     }
 }
 
@@ -981,7 +981,7 @@ void Array::SetAddMergedBottomSize( sal_Int32 nCol, 
sal_Int32 nRow, sal_Int32 nA
             return;
         Cell aTempCell(*pTempCell);
         aTempCell.mnAddBottom = nAddSize;
-        mxImpl->PutCell( nCol, nRow, aTempCell );
+        mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
     }
 }