diff options
author | Henry Castro <hcastro@collabora.com> | 2020-10-09 07:01:17 -0400 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2020-11-08 21:42:21 +0100 |
commit | 663de10f95bb72630658a5a06501e37d1810e0c7 (patch) | |
tree | 6aca88ab44d280ed138ae2517c528e5b47701391 | |
parent | 91d0041afc2be14a70cd4a0101b09b369ce49f8f (diff) |
lok: sidebar: disable context deactivation
In the Collabora Online, for every SfxViewFrame instance,
it has a relationship with a user name, and it is not allowed
to deactivate the sidebar of the other user.
However, in the Desktop case, a user name has a relationship to many
SfxViewFrame instances and it can deactivate the sidebar
when a SfxViewFrame instance receives the input focus.
Change-Id: If1936f1dc3779664970bd584e2b9d6f595c4b072
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104115
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r-- | sfx2/source/appl/app.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/sidebar/ContextChangeBroadcaster.cxx | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 2bf0e9785555..cb981777172d 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -298,8 +298,7 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame ) if ( bTaskActivate ) NotifyEvent( SfxViewEventHint( SfxEventHintId::DeactivateDoc, GlobalEventConfig::GetEventName(GlobalEventId::DEACTIVATEDOC), pOldFrame->GetObjectShell(), pOldFrame->GetFrame().GetController() ) ); - if ( !comphelper::LibreOfficeKit::isDialogPainting() ) - pOldFrame->DoDeactivate( bTaskActivate, pFrame ); + pOldFrame->DoDeactivate( bTaskActivate, pFrame ); if( pOldFrame->GetProgress() ) pOldFrame->GetProgress()->Suspend(); diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx index aece2861fcf2..b5213abff335 100644 --- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx +++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx @@ -55,13 +55,10 @@ void ContextChangeBroadcaster::Activate (const css::uno::Reference<css::frame::X void ContextChangeBroadcaster::Deactivate (const css::uno::Reference<css::frame::XFrame>& rxFrame) { - if (msContextName.getLength() > 0) + if (msContextName.getLength() > 0 && !comphelper::LibreOfficeKit::isActive()) { - BroadcastContextChange( - rxFrame, - GetModuleName(rxFrame), - (comphelper::LibreOfficeKit::isActive() ? msContextName: - vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Default))); + BroadcastContextChange(rxFrame, GetModuleName(rxFrame), + vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Default)); } } |