diff options
| -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)); } } |