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

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

 sw/source/core/view/viewsh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ca2023620081416846bd6bf83a0c81a2cf65b0bd
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Jun 9 15:32:52 2021 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Jun 10 10:19:55 2021 +0200

    do not draw directly in SwViewShell in LOK mode
    
    Online mode draws tiles as necessary, so there's no need to care
    about flickering, and this drawing is in fact not needed at all
    for Online.
    
    Change-Id: I19d981ad6ab6890ada1f415dc251a3492fd054ec
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116920
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 2aa2d03ec4e775d9399420c21cd1f2e972984154)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116899
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 2f4aee28b52b..c00f585d6711 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -472,7 +472,7 @@ void SwViewShell::ImplUnlockPaint( bool bVirDev )
     CurrShell aCurr( this );
     if ( GetWin() && GetWin()->IsVisible() )
     {
-        if ( (bInSizeNotify || bVirDev ) && VisArea().HasArea() )
+        if ( (bInSizeNotify || bVirDev ) && VisArea().HasArea() && !comphelper::LibreOfficeKit::isActive())
         {
             //Refresh with virtual device to avoid flickering.
             VclPtrInstance<VirtualDevice> pVout( *mpOut );