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

New commits:
commit 35f64398806d6361d427a38446fd3da70eff4915
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Wed Aug 9 16:48:42 2023 -0400
Commit:     Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Aug 10 16:52:08 2023 +0200

    tdf#155799: sc: fix paint the reference mark
    
    If a reference mark is initiated with the first click,
    the initial range points are the same and extended
    if merged cells, but if the user drag&drop more cells
    the Range end has to extend if merged cells
    
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Change-Id: Ife7c4514a9303226b73bff61bd0df689f81af42f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155533
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    (cherry picked from commit ebd1a4d6fc3f9ba533a29fa54acf7b3b41c398d5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155485
    Tested-by: Aron Budea <aron.bu...@collabora.com>
    Reviewed-by: Aron Budea <aron.bu...@collabora.com>

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index d2a65bac6df0..085708bafa67 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -2019,6 +2019,8 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW 
nRefStartY,
 
     if ( nRefStartX == nRefEndX && nRefStartY == nRefEndY )
         mpDoc->ExtendMerge( nRefStartX, nRefStartY, nRefEndX, nRefEndY, nTab );
+    else if (mpDoc->HasAttrib(nRefEndX, nRefEndY, nTab, HasAttrFlags::Merged))
+        mpDoc->ExtendMerge(nRefEndX, nRefEndY, nRefEndX, nRefEndY, nTab);
 
     if ( !(nRefStartX <= nVisX2 && nRefEndX >= nVisX1 &&
          nRefStartY <= nVisY2 && nRefEndY >= nVisY1) )

Reply via email to