diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-05-14 14:36:24 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-05-14 16:34:32 +0200 |
| commit | f264b2ffc4f8cad28cfe852ddba63f30293e321c (patch) | |
| tree | d5e75d995b3c649e42c87471fde01b450c25103f /sw/qa/extras/tiledrendering | |
| parent | c61b75eede5ffd6e18a44130eba25e50dccfb1d4 (diff) | |
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.
Change-Id: Ib9e7dcd72458a4126404b78bbdb6678b10d15ce3
Reviewed-on: https://gerrit.libreoffice.org/72287
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/qa/extras/tiledrendering')
| -rw-r--r-- | sw/qa/extras/tiledrendering/tiledrendering.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 777f325e8f78..b7d90cb6f02a 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -938,7 +938,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); @@ -968,6 +970,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() |