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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 10f450ad26b86104f641132219922e475d5d11e2
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue May 14 14:36:24 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Aug 27 15:30:53 2019 +0200

    CppunitTest_sw_tiledrendering: avoid stack-use-after-return in ...
    
    .. testViewCursors()
    
    This is a good idea in general, but it's in preparation of enabling the
    sidebar by default during tiled rendering.
    
    (cherry picked from commit f264b2ffc4f8cad28cfe852ddba63f30293e321c)
    
    Change-Id: Ib9e7dcd72458a4126404b78bbdb6678b10d15ce3
    Reviewed-on: https://gerrit.libreoffice.org/78175
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 171588bc63fe..d5d5049fb691 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -928,7 +928,9 @@ void SwTiledRenderingTest::testViewCursors()
     SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
     ViewCallback aView1;
     SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback, &aView1);
+    int nView1 = SfxLokHelper::getView();
     SfxLokHelper::createView();
+    int nView2 = SfxLokHelper::getView();
     ViewCallback aView2;
     SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback, &aView2);
     CPPUNIT_ASSERT(aView1.m_bOwnCursorInvalidated);
@@ -958,6 +960,11 @@ void SwTiledRenderingTest::testViewCursors()
     CPPUNIT_ASSERT(aView1.m_bViewSelectionSet);
     CPPUNIT_ASSERT(aView2.m_bOwnSelectionSet);
     CPPUNIT_ASSERT(!aView2.m_bViewSelectionSet);
+
+    SfxLokHelper::setView(nView1);
+    SfxViewShell::Current()->registerLibreOfficeKitViewCallback(nullptr, nullptr);
+    SfxLokHelper::setView(nView2);
+    SfxViewShell::Current()->registerLibreOfficeKitViewCallback(nullptr, nullptr);
 }
 
 void SwTiledRenderingTest::testShapeViewCursors()