summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2022-07-21 13:27:45 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2022-07-26 11:55:51 +0200
commitbb5643c1318de5b1ee0adcfbe8c4c4115a175ac1 (patch)
tree6c36f6e0a6e59f346d311d584d728b5dbee61b93 /sw
parent9e18bc8eca8bf340f765d2eb2d8bcad83b4412b3 (diff)
Revert "do not draw directly in SwViewShell in LOK mode"
It is actually needed to process SwViewShellImp's paint region, as otherwise testTablePaintInvalidate::TestBody from CppunitTest_sw_tiledrendering will end up in an infinite loop repeatedly calling SwLayIdle ctor. That's what I tried to handle in b9c2207e1b5247b4d3184b137be9a75a4b8c6c37 and got it wrong. This reverts commit 2aa2d03ec4e775d9399420c21cd1f2e972984154. Change-Id: I25e897ea4e38db48cd969a3c21d677701f75a0aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137293 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 94bde29634c095e40bfcf74d27821b48919595da) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137315 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/view/viewsh.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index b16b2d042727..7c4b55729ca7 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -478,7 +478,7 @@ void SwViewShell::ImplUnlockPaint( bool bVirDev )
CurrShell aCurr( this );
if ( GetWin() && GetWin()->IsVisible() )
{
- if ( (bInSizeNotify || bVirDev ) && VisArea().HasArea() && !comphelper::LibreOfficeKit::isActive())
+ if ( (bInSizeNotify || bVirDev ) && VisArea().HasArea() )
{
//Refresh with virtual device to avoid flickering.
VclPtrInstance<VirtualDevice> pVout( *mpOut );