sc/source/ui/view/output.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit b58dbb862296b63f3f2395c59d30fba40fa5f59f
Author: Justin Luth <justin_l...@sil.org>
AuthorDate: Fri Dec 17 11:47:55 2021 +0200
Commit: Justin Luth <jl...@mail.com>
CommitDate: Fri Dec 17 12:40:23 2021 +0100
tdf#58125 sc: don't show comment notifier for hidden columns
This fixes a LO 3.6-ish regression.
Things have changed a lot since then. I assume that pCell
was empty when it was hidden. The test for pCell was
removed in commit c06dbbe7594c2a0b5a5b19f8e183d9c421e6e094,
which was in the range that bibisect suggested.
Change-Id: I0af137358335a808de901111a71f5c113fabcf24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127001
Reviewed-by: Justin Luth <jl...@mail.com>
Tested-by: Jenkins
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index d5e5d24464ae..fe6b3c278884 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -2327,11 +2327,10 @@ void ScOutputData::DrawNoteMarks(vcl::RenderContext&
rRenderContext)
SCCOL nMergeX = nX;
SCROW nMergeY = nY;
mpDoc->ExtendOverlapped( nMergeX, nMergeY, nX, nY, nTab );
- // use origin's pCell for NotePtr test below
}
- if ( mpDoc->GetNote(nX, pRowInfo[nArrY].nRowNo, nTab) && (
bIsMerged ||
- ( !pInfo->bHOverlapped && !pInfo->bVOverlapped ) ) )
+ if (!mpDoc->ColHidden(nX, nTab) && mpDoc->GetNote(nX,
pRowInfo[nArrY].nRowNo, nTab)
+ && (bIsMerged || (!pInfo->bHOverlapped &&
!pInfo->bVOverlapped)))
{
if (bFirst)
{
