summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2021-12-23 19:17:24 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2021-12-23 20:52:49 +0100
commit2954039767e1adab7a65838b61a449b701f244a4 (patch)
tree3a4099a5f269fda7dac9f7b5e345acba03b8a693 /sw/source
parentc13db6e792cc347ffff4585f23866f195651f21f (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>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/layout/frmtool.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 79fbaa2d602e..b2ac45b5ead9 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1206,8 +1206,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))