diff options
| author | Henry Castro <hcastro@collabora.com> | 2020-10-09 07:01:17 -0400 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-11-10 14:12:15 +0100 |
| commit | da5e0c7fb19cb35cf5532d18e7eea166720f2e08 (patch) | |
| tree | 47ba7ba3a745f2efb530c6583205b6b238189a67 | |
| parent | 8db6290fbf80c4da993dd1138d6a848b4c9ea8db (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>
(cherry picked from commit 663de10f95bb72630658a5a06501e37d1810e0c7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105452
Tested-by: Jenkins
| -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 16592e536f27..f3138419f4a3 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -256,8 +256,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 98763949f7b1..b000ec3f8c97 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)); } } |