diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-12-23 19:17:24 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-12-28 21:06:31 +0100 |
| commit | 330324e943b1b228d90b637d2f273d441b0773f9 (patch) | |
| tree | 268fc2456c2851d169d075d8b64d7bbcc1a72f91 /sw | |
| parent | c6feb49dc3a763c7ab4a3db7d1380bb82844705a (diff) | |
tdf#138743 sw_redlinehide: delete FlyFrames when hiding tracked changes
Cannot remember why but when RemoveHiddenObjsOfNode() was added in
commit 464ef392f901c6e2ad3d32df8b039f2226073cf4 only as-char draw shapes
were removed from the draw page, but as-char fly frames remained.
For these only a barely visible border is painted sometimes, but the
problem is they remain as a mouse click target, not sure how i didn't
notice this earlier.
Somehow image painting is wonky on current master, works fine on 7.1.
Change-Id: Ie4e20f6a399daadda1badf155ba510445394f5e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127366
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 2954039767e1adab7a65838b61a449b701f244a4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127373
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit cc33e4d46cb43ba9285ea3deaacbd4ee6374dd0f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127380
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Hossein <hossein@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/frmtool.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 51ace45200bc..40ed6cee2904 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1165,8 +1165,7 @@ void RemoveHiddenObjsOfNode(SwTextNode const& rNode, { SwFormatAnchor const& rAnchor = pFrameFormat->GetAnchor(); if (rAnchor.GetAnchorId() == RndStdIds::FLY_AT_CHAR - || (rAnchor.GetAnchorId() == RndStdIds::FLY_AS_CHAR - && RES_DRAWFRMFMT == pFrameFormat->Which())) + || rAnchor.GetAnchorId() == RndStdIds::FLY_AS_CHAR) { assert(rAnchor.GetContentAnchor()->nNode.GetIndex() == rNode.GetIndex()); if (!IsShown(rNode.GetIndex(), rAnchor, pIter, pEnd, pFirstNode, pLastNode)) |