sc/source/ui/view/output.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a24a6e484c4ba1f9193af94084c861f09af9f027
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Mon Dec 30 06:19:24 2024 -0400
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Fri Jan 24 15:38:11 2025 +0100
tdf#164130: ensure valid column and row values
Sometimes the range mark has not valid col/row values.
Signed-off-by: Henry Castro <hcas...@collabora.com>
Change-Id: I29cf70c8c2a4e832f1ee65abac0ff55e49295fc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179897
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
(cherry picked from commit 289667abb3bcf165402f4f5c10af91ec59b0d26f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179916
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit 8e250191dfabc8e1396170399facce5562b248f9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180708
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index be6fa725b3f7..dc8dd29484ff 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -2017,7 +2017,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))
+ else if (mpDoc->ValidCol(nRefEndX) && mpDoc->ValidRow(nRefEndY) &&
+ mpDoc->HasAttrib(nRefEndX, nRefEndY, nTab, HasAttrFlags::Merged))
mpDoc->ExtendMerge(nRefEndX, nRefEndY, nRefEndX, nRefEndY, nTab);
if ( !(nRefStartX <= nVisX2 && nRefEndX >= nVisX1 &&
