diff options
| author | Justin Luth <justin_luth@sil.org> | 2021-12-17 11:47:55 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-12-17 23:05:12 +0100 |
| commit | 13814db571b1d08a7f301cd2de3618a387d9dfe4 (patch) | |
| tree | dfad6dc5b95dfd9c1942ba4b08bf807d1755bc5d /sc | |
| parent | e700b5c25f094f11bdb92b3fdb67a27420e805a9 (diff) | |
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 <jluth@mail.com>
Tested-by: Jenkins
(cherry picked from commit b58dbb862296b63f3f2395c59d30fba40fa5f59f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126975
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/output.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
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) { |