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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Wed Sep 8 09:39:52 UTC 2021


 vcl/source/window/paint.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 79ffe18e08a531ec3d0bed2277f6c5f304261ffd
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Sep 8 12:37:55 2021 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Sep 8 12:37:55 2021 +0300

    Revert "Tentative fix for crash in the iOS app"
    
    The root cause for the problem was fixed elsewhere by
    0f65b4b6f33891a724bee5356aa5549c76fa0ce3 (and back-ports).
    
    This reverts (the back-port of) commit
    9e4c72ec7ea83aa0d023a90a6b02ddb17c6b2d74.
    
    Change-Id: I0167846d2aaeacc66657b4203d0118b7847679ba

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index f361e49d392b..e890503e615d 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -645,7 +645,6 @@ void Window::ImplCallOverlapPaint()
 
 IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 {
-#ifndef IOS
     comphelper::ProfileZone aZone("VCL idle re-paint");
 
     // save paint events until layout is done
@@ -668,7 +667,6 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
             mpWindowImpl->mpFrameData->maPaintIdle.IsActive())
             mpWindowImpl->mpFrameData->maPaintIdle.Stop();
     }
-#endif
 }
 
 IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Timer *, void)


More information about the Libreoffice-commits mailing list