From 330324e943b1b228d90b637d2f273d441b0773f9 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 23 Dec 2021 19:17:24 +0100 Subject: 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 (cherry picked from commit 2954039767e1adab7a65838b61a449b701f244a4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127373 Reviewed-by: Thorsten Behrens (cherry picked from commit cc33e4d46cb43ba9285ea3deaacbd4ee6374dd0f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127380 Reviewed-by: Noel Grandin Reviewed-by: Hossein Reviewed-by: Xisco Fauli Tested-by: Xisco Fauli --- sw/source/core/layout/frmtool.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sw') 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)) -- cgit v1.2.3