[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/qa

[Miklos Vajna (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 262d9096440c03dbcf9230ee6c3f4cf3e5e3a1af
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed May 15 10:07:27 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed May 15 15:18:04 2019 +0200

    Revert "CppunitTest_sw_tiledrendering: close the document while LOK is ...
    
    ... still active"
    
    This reverts commit 31405b20fed5f3e98be25501a25e25963f3102f9. This was a
    cp-6.0-only commit and what the commit messages writes is great, except
    it seems this was already the case.
    
    What the commit does is exactly the opposite: closing the document while
    LOK is no longer active. (This fixes an assert on VCL shutdown.)
    
    Change-Id: I605d9808d993ffbf27db89c03cd2a520a5149c0f
    Reviewed-on: https://gerrit.libreoffice.org/72344
    Tested-by: Aron Budea <aron.budea at collabora.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 5a623ab34f04..56e947813d99 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -2406,8 +2406,6 @@ void SwTiledRenderingTest::testDeselectCustomShape()
     pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, aStart.getX(), aStart.getY(), 1, MOUSE_LEFT, 0);
     Scheduler::ProcessEventsToIdle();
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), pWrtShell->GetDrawView()->GetMarkedObjectList().GetMarkCount());
-
-    comphelper::LibreOfficeKit::setActive(false);
 }
 
 void SwTiledRenderingTest::testSemiTransparent()