[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source

[Henry Castro (via logerrit)]

 vcl/source/window/paint.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 287d46b192d0da14cac30468d33e9486aaa0e4de
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Sep 25 07:11:24 2019 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat Sep 28 21:21:28 2019 +0200

    tdf#126967:vcl: lok: avoid starting idle paint task
    
    In the Tiled rendering case the invalidation is handled
    by sending logic invalidate notifications to client side.
    Starting an idle paint task, it provokes an infinity loop
    that it does not have the chance to process client side messages
    (mpPollCallback).
    
    Change-Id: I6ef1bbd6270592eebfeef0c8a37945bf5ddd3580
    Reviewed-on: https://gerrit.libreoffice.org/79537
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit bb11efa477b6700744560d3999190c65d016600b)
    Reviewed-on: https://gerrit.libreoffice.org/79662
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index a94689cc42ad..979adc09dd0a 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -653,6 +653,9 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
     else if ( mpWindowImpl->mbReallyVisible )
     {
         ImplCallOverlapPaint();
+        if (comphelper::LibreOfficeKit::isActive() &&
+            mpWindowImpl->mpFrameData->maPaintIdle.IsActive())
+            mpWindowImpl->mpFrameData->maPaintIdle.Stop();
     }
 }