summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2021-03-23 14:53:58 +0100
committerAron Budea <aron.budea@collabora.com>2021-03-26 22:08:04 +0100
commitc5f8b8b58bdc04211b490303c3b9230f7e5ea368 (patch)
tree142b33c878274cce12de3decdbe594af8efba71d
parenteea9c8069cbd1deeca5af6866090984f28892ac8 (diff)
Revert "lok: switch to the correct view before any UI update is done
via SfxBindings." In online Impress the status bar content didn't get filled in a 2nd view. This reverts commit 35b81a05c7c58d0db2276627a9387a738c409974. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112997 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit bdbb5d0389642c0d445b5779fe2a18fda3e4a4d4) Change-Id: I29adf767d2bf3fa0f19b13f8eae3d2464cd90601 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113186 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
-rw-r--r--sd/qa/unit/tiledrendering/tiledrendering.cxx4
-rw-r--r--sfx2/source/control/bindings.cxx23
2 files changed, 0 insertions, 27 deletions
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index b25c53c31d4b..64e6196ae605 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1002,7 +1002,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();
@@ -1016,7 +1015,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;
@@ -1184,8 +1182,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);
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 6be545d382bf..1d6fd0d62441 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -55,9 +55,6 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/msgpool.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/lokhelper.hxx>
-#include <comphelper/lok.hxx>
#include <cstddef>
#include <memory>
@@ -1243,26 +1240,6 @@ bool SfxBindings::NextJob_Impl(Timer const * pTimer)
SfxApplication *pSfxApp = SfxGetpApp();
- // Switch to the right view for state update.
- if (comphelper::LibreOfficeKit::isActive())
- {
- if( pDispatcher )
- {
- SfxViewFrame* pFrame = pDispatcher->GetFrame();
- if (pFrame)
- {
- vcl::Window* pFrameWin = pFrame->GetWindow().GetFrameWindow();
- if (pFrameWin && pFrameWin->GetLOKNotifier()) {
- const SfxViewShell* pView = dynamic_cast<const SfxViewShell*>(pFrameWin->GetLOKNotifier());
- if (pView)
- {
- SfxLokHelper::setView(pView->GetViewShellId().get());
- }
- }
- }
- }
- }
-
if( pDispatcher )
pDispatcher->Update_Impl();