1 files changed, 5 insertions, 30 deletions

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 29f34de4f53c..425c6c19118c 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -646,13 +646,6 @@ void Window::ImplCallOverlapPaint()
 
 IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 {
-    if (comphelper::LibreOfficeKit::isActive())
-    {
-        // Tiled rendering is used, idle paint does not need to do anything.
-        mpWindowImpl->mpFrameData->maPaintIdle.Stop();
-        return;
-    }
-
     comphelper::ProfileZone aZone("VCL idle re-paint");
 
     // save paint events until layout is done
@@ -671,6 +664,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();
     }
 }
 
@@ -691,12 +687,6 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Timer *, void)
 
 void Window::ImplInvalidateFrameRegion( const vcl::Region* pRegion, InvalidateFlags nFlags )
 {
-    if (comphelper::LibreOfficeKit::isActive())
-    {
-        // Tiled rendering is used, so there's no need to invalidate for idle painting.
-        return;
-    }
-
     // set PAINTCHILDREN for all parent windows till the first OverlapWindow
     if ( !ImplIsOverlapWindow() )
     {
@@ -758,12 +748,6 @@ void Window::ImplInvalidateFrameRegion( const vcl::Region* pRegion, InvalidateFl
 
 void Window::ImplInvalidateOverlapFrameRegion( const vcl::Region& rRegion )
 {
-    if (comphelper::LibreOfficeKit::isActive())
-    {
-        // Tiled rendering is used, so there's no need to invalidate for idle painting.
-        return;
-    }
-
     vcl::Region aRegion = rRegion;
 
     ImplClipBoundaries( aRegion, true, true );
@@ -794,12 +778,6 @@ void Window::ImplInvalidateParentFrameRegion( vcl::Region& rRegion )
 
 void Window::ImplInvalidate( const vcl::Region* pRegion, InvalidateFlags nFlags )
 {
-    if (comphelper::LibreOfficeKit::isActive())
-    {
-        // Tiled rendering is used, so there's no need to invalidate for idle painting.
-        return;
-    }
-
     // check what has to be redrawn
     bool bInvalidateAll = !pRegion;
 
@@ -1203,11 +1181,8 @@ void Window::Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags )
     tools::Rectangle aRect = pOutDev->ImplLogicToDevicePixel( rRect );
     if ( !aRect.IsEmpty() )
     {
-        if (!comphelper::LibreOfficeKit::isActive())
-        {   // ImplInvalidate() immediatelly returns in LOK mode, skip useless Region construction
-            vcl::Region aRegion( aRect );
-            ImplInvalidate( &aRegion, nFlags );
-        }
+        vcl::Region aRegion( aRect );
+        ImplInvalidate( &aRegion, nFlags );
         tools::Rectangle aLogicRectangle(rRect);
         LogicInvalidate(&aLogicRectangle);
     }