summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sfx2/source/appl/app.cxx3
-rw-r--r--sfx2/source/sidebar/ContextChangeBroadcaster.cxx9
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));
}
}