diff options
Diffstat (limited to 'svx/source/sidebar/ContextChangeEventMultiplexer.cxx')
-rw-r--r-- | svx/source/sidebar/ContextChangeEventMultiplexer.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx index 321a56c5024e..af804342fa34 100644 --- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx +++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx @@ -39,13 +39,6 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( { if (rxController.is() && rxController->getFrame().is()) { - // notify the LOK too - if (comphelper::LibreOfficeKit::isActive()) - { - if (SfxViewShell* pViewShell = SfxViewShell::Get(rxController)) - SfxLokHelper::notifyContextChange(pViewShell, GetModuleName(rxController->getFrame()), vcl::EnumContext::GetContextName(eContext)); - } - const css::ui::ContextChangeEventObject aEvent( rxController, GetModuleName(rxController->getFrame()), @@ -56,6 +49,13 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( ::comphelper::getProcessComponentContext())); if (xMultiplexer.is()) xMultiplexer->broadcastContextChangeEvent(aEvent, rxController); + + // notify the LOK too after all the change have taken effect. + if (comphelper::LibreOfficeKit::isActive()) + { + if (SfxViewShell* pViewShell = SfxViewShell::Get(rxController)) + SfxLokHelper::notifyContextChange(pViewShell, GetModuleName(rxController->getFrame()), vcl::EnumContext::GetContextName(eContext)); + } } } |