summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2022-07-21 13:31:17 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2022-07-26 11:58:11 +0200
commite61e77481174692d5be72962f6f029e6f4e2e8d9 (patch)
tree641704cfc6bb99d833b66d6f2d8b66b4c331c640 /sw
parentbb5643c1318de5b1ee0adcfbe8c4c4115a175ac1 (diff)
Revert "avoid repeated writer layout calls with tiled rendering" (tdf#145396)
This was incorrect, the proper fix was my previous Writer commit. This reverts commit b9c2207e1b5247b4d3184b137be9a75a4b8c6c37. Change-Id: I829da1633dd11cb0c6e944fbf5acef030fad7dc4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137294 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 9dff8edf97f454f24a40acbed4a9297816f91da6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137316 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/layout/layact.cxx11
1 files changed, 1 insertions, 10 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index b2b246e5eb2f..9375ca13cd51 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2275,16 +2275,7 @@ SwLayIdle::SwLayIdle( SwRootFrame *pRt, SwViewShellImp *pI ) :
{
--rSh.mnStartAction;
- // When using tiled rendering, idle painting is disabled and paints are done
- // only later by tiled rendering. But paints call SwViewShellImp::DeletePaintRegion()
- // to reset this HasPaintRegion(), and if it's done too late,
- // SwTiledRenderingTest::testTablePaintInvalidate() will end up in an infinite
- // loop, because the idle layout will call this code repeatedly, because there
- // will be no idle paints to reset HasPaintRegion().
- // This code dates back to the initial commit, and I find its purpose unclear,
- // so I'm still leaving it here in case it turns out it serves a purpose.
- static const bool blockOnRepaints = true;
- if (!blockOnRepaints && rSh.Imp()->HasPaintRegion())
+ if ( rSh.Imp()->HasPaintRegion() )
bActions = true;
else
{