From ce14db425434c10551a0ff794cba2ccc049d4f70 Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Fri, 17 Dec 2021 11:47:55 +0200 Subject: 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 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143480 Tested-by: Balazs Varga Reviewed-by: Balazs Varga --- sc/source/ui/view/output.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index e14647bd7954..9864a104b6be 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -2313,11 +2313,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) { -- cgit