[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/source

[Henry Castro (via logerrit)]

 sc/source/ui/view/tabview4.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit db19cb262534c051cf4342055b50332d21e06aa8
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Tue Jul 18 15:15:41 2023 -0400
Commit:     Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Aug 10 16:51:31 2023 +0200

    tdf#155799: sc: fix "UpdateRef"" to update extended merged cells
    
    Extend the merged cell if the current has the attribute "Merged".
    ...
    
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Change-Id: Ia2d5983d89b8661abb683d10d4de8bd0c5adea7d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154993
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153406
    Tested-by: Aron Budea <aron.bu...@collabora.com>
    Reviewed-by: Aron Budea <aron.bu...@collabora.com>

diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 5238947a88f3..3ed71a5ef931 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -213,6 +213,9 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB 
nCurZ )
             rDoc.ExtendMerge( nStartX, nStartY, nEndX, nEndY, nTab );
         ScUpdateRect aRect( nStartX, nStartY, nEndX, nEndY );
 
+        if (rDoc.HasAttrib(nCurX, nCurY, nCurZ, HasAttrFlags::Merged))
+            rDoc.ExtendMerge(nStartX, nStartY, nCurX, nCurY, nCurZ);
+
         aViewData.SetRefEnd( nCurX, nCurY, nCurZ );
 
         nStartX = aViewData.GetRefStartX();