diff options
| author | Henry Castro <hcastro@collabora.com> | 2023-08-09 16:48:42 -0400 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2023-08-10 16:52:08 +0200 |
| commit | 35f64398806d6361d427a38446fd3da70eff4915 (patch) | |
| tree | db5298dc070d6f8e1104649f07a0bc7328f3a113 | |
| parent | db19cb262534c051cf4342055b50332d21e06aa8 (diff) | |
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 <hcastro@collabora.com>
Change-Id: Ife7c4514a9303226b73bff61bd0df689f81af42f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155533
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit ebd1a4d6fc3f9ba533a29fa54acf7b3b41c398d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155485
Tested-by: Aron Budea <aron.budea@collabora.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
| -rw-r--r-- | sc/source/ui/view/output.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
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) ) |