diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2021-03-23 14:53:58 +0100 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2021-03-23 23:56:08 +0100 |
| commit | bdbb5d0389642c0d445b5779fe2a18fda3e4a4d4 (patch) | |
| tree | e44e01adee1316165285045f726ad67cb00d66d8 /sd | |
| parent | f36baa475515fd08b53c4a677e8fbd5cf0fec0a1 (diff) | |
Revert "lok: switch to the correct view before any UI update is done
via SfxBindings."
This reverts commit 35b81a05c7c58d0db2276627a9387a738c409974.
Change-Id: I29adf767d2bf3fa0f19b13f8eae3d2464cd90601
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112997
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/tiledrendering/tiledrendering.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index d553dfce610f..cc11e2483991 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -1005,7 +1005,6 @@ void SdTiledRenderingTest::testViewCursorParts() SfxLokHelper::createView(); pXImpressDocument->initializeForTiledRendering(uno::Sequence<beans::PropertyValue>()); ViewCallback aView2; - int nView2 = SfxLokHelper::getView(); // Select the shape in the second view. sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell(); @@ -1019,7 +1018,6 @@ void SdTiledRenderingTest::testViewCursorParts() pView->UnmarkAllObj(pView->GetSdrPageView()); // Now switch to the second part in the second view. - SfxLokHelper::setView(nView2); pXImpressDocument->setPart(1); aView2.m_nPart = 1; aView1.m_bGraphicViewSelectionInvalidated = false; @@ -1060,10 +1058,10 @@ void SdTiledRenderingTest::testCursorViews() // second view as well, even if the second view was created after begin // text edit in the first view. ViewCallback aView2; - SfxLokHelper::setView(nView1); // This failed: the second view didn't get a lock notification, even if the // first view already started text edit. CPPUNIT_ASSERT(aView2.m_bViewLock); + SfxLokHelper::setView(nView1); aView2.m_bTilesInvalidated = false; pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0); pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'x', 0); @@ -1190,8 +1188,6 @@ void SdTiledRenderingTest::testCursorVisibility_MultiView() pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, centerX, centerY, 2, MOUSE_LEFT, 0); - - SfxLokHelper::setView(nView1); pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, centerX, centerY, 2, MOUSE_LEFT, 0); |