sfx2/source/appl/app.cxx | 3 +--
sfx2/source/sidebar/ContextChangeBroadcaster.cxx | 9 +++------
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 663de10f95bb72630658a5a06501e37d1810e0c7
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Fri Oct 9 07:01:17 2020 -0400
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Nov 8 21:42:21 2020 +0100
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
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));
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
