From 2b26c1796d0a05f47cfb01d79ee4f69344efbbb2 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 6 Jul 2015 17:49:35 +0200 Subject: [PATCH] tdf#92577 sw rendercontext: paint transparent from controls conditionally Regression from commit beb4aa21d61f0d66392d596be86fb57b4b167239 (SwViewShell::ImplEndAction: avoid direct paint, 2015-06-29), the problem was that the lcl_PaintTransparentFormControls() call performs direct paint, so it should be called only in case we don't do an async paint via invalidate. As expected, this call is no longer needed for the original i#107365 bug document in case SwViewShell::Paint() will be called by the main loop shortly. Change-Id: Ia27c551ed838d610f972f20abbb4ae9f0e1241b6 --- sw/source/core/view/viewsh.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index b8ed7138e613..950bcac4893b 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -407,8 +407,8 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) { InvalidateWindows(aRect.SVRect()); } - - lcl_PaintTransparentFormControls(*this, aRect); // i#107365 + else + lcl_PaintTransparentFormControls(*this, aRect); // i#107365 } pVout.disposeAndClear();