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

[Henry Castro (via logerrit)]

 sc/source/ui/view/tabview4.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 48e03dfb8398fa7dc881f039f9d56b729e95ca8d
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Fri Aug 11 09:11:09 2023 -0400
Commit:     Aron Budea <aron.bu...@collabora.com>
CommitDate: Sat Aug 12 00:53:20 2023 +0200

    tdf#155799: sc: fix input formula reference
    
    If the start point reference mark is selected
    with mouse direction up, it should extend to show
    the correct input formula reference.
    
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Change-Id: I41f2ea52bf7de341eccadfba80e91fd76a6fd2de
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155618
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155593
    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 3ed71a5ef931..9ff3d41ef4df 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -229,9 +229,13 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB 
nCurZ )
         ScRefType eType = aViewData.GetRefType();
         if ( eType == SC_REFTYPE_REF )
         {
+            if ((nStartX > nEndX || nStartY > nEndY) &&
+                rDoc.HasAttrib(nStartX, nStartY, nTab, HasAttrFlags::Merged))
+                rDoc.ExtendMerge( nStartX, nStartY, nStartX, nStartY, nTab );
+
             ScRange aRef(
-                    aViewData.GetRefStartX(), aViewData.GetRefStartY(), 
aViewData.GetRefStartZ(),
-                    aViewData.GetRefEndX(), aViewData.GetRefEndY(), 
aViewData.GetRefEndZ() );
+                    nStartX, nStartY, aViewData.GetRefStartZ(),
+                    nEndX, nEndY, aViewData.GetRefEndZ() );
             SC_MOD()->SetReference( aRef, rDoc, &rMark );
             ShowRefTip();
         }