summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2021-12-17 11:47:55 +0200
committerBalazs Varga <balazs.varga.extern@allotropia.de>2022-11-30 09:54:48 +0100
commitce14db425434c10551a0ff794cba2ccc049d4f70 (patch)
tree5b8f11fc023e2742711576113ee4c5ccc1be3b0f
parentd070070003f0cc9d42f3a6bdd37999bdebca39ac (diff)
tdf#58125 sc: don't show comment notifier for hidden columnsdistro/cib/libreoffice-6-4
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 <jluth@mail.com> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143480 Tested-by: Balazs Varga <balazs.varga.extern@allotropia.de> Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>
-rw-r--r--sc/source/ui/view/output.cxx5
1 files 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)
{