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

[Luboš Luňák (via logerrit)]

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

New commits:
commit 3604738373198feb4c1c7a9ef82b6ea1579265d8
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Fri Sep 24 11:47:30 2021 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Sep 28 13:51:12 2021 +0200

    optimize out a bit of Invalidate() in LOK mode
    
    Change-Id: I3c076e2506c9cade7e6bb874a2cddfa1ef0db6a7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122641
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index c7c3b7544937..8531ead70012 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1202,8 +1202,11 @@ void Window::Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags )
     tools::Rectangle aRect = pOutDev->ImplLogicToDevicePixel( rRect );
     if ( !aRect.IsEmpty() )
     {
-        vcl::Region aRegion( aRect );
-        ImplInvalidate( &aRegion, nFlags );
+        if (!comphelper::LibreOfficeKit::isActive())
+        {   // ImplInvalidate() immediatelly returns in LOK mode, skip useless Region construction
+            vcl::Region aRegion( aRect );
+            ImplInvalidate( &aRegion, nFlags );
+        }
         tools::Rectangle aLogicRectangle(rRect);
         LogicInvalidate(&aLogicRectangle);
     }