sw/qa/extras/tiledrendering/tiledrendering.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit f264b2ffc4f8cad28cfe852ddba63f30293e321c
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue May 14 14:36:24 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue May 14 16:34:32 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.
Change-Id: Ib9e7dcd72458a4126404b78bbdb6678b10d15ce3
Reviewed-on: https://gerrit.libreoffice.org/72287
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
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()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
