[Libreoffice-commits] core.git: sw/source

Miklos Vajna vmiklos at collabora.co.uk
Mon Jun 29 11:42:46 PDT 2015


 sw/source/core/view/viewsh.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit beb4aa21d61f0d66392d596be86fb57b4b167239
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jun 29 18:35:12 2015 +0200

    SwViewShell::ImplEndAction: avoid direct paint
    
    Commit 56dd27d9ed829ea0444b3b5932dcd0d431d6e251 (sw: invalidate after
    keypresses when we have a callback, 2015-01-13) only enabled
    invalidate-then-paint for the tiled rendering case, because the main
    loop had no priorities back then.
    
    This limitation went away with 48c2815dd20cf20eeec8bb4e003000f4a3d13291
    (tdf#91727 - Unwind non-dispatch of idle handlers., 2015-06-10), so it's
    not a problem to always do this panting inside the Paint() call.
    
    Change-Id: I98ddfcc0f20f1553974b74ec3c859dde315612e4
    Reviewed-on: https://gerrit.libreoffice.org/16587
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 7998259..a835373 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -410,10 +410,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
 
                         if ( bPaintsFromSystem )
                             PaintDesktop(*GetOut(), aRect);
-                        if (!isTiledRendering())
-                            pCurrentLayout->Paint( *mpOut, aRect );
-                        else
-                            pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
+                        pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
 
                         // #i75172# end DrawingLayer paint
                         DLPostPaint2(true);


More information about the Libreoffice-commits mailing list