diff options
author | Jan Holesovsky <kendy@collabora.com> | 2018-11-06 11:20:27 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2018-11-06 17:35:06 +0100 |
commit | df4f2b117d5925fa9e1fa4f9b3aec424022a583f (patch) | |
tree | 40c6d919706638387a7c5fb031738e60e2fae825 /sfx2 | |
parent | 28a698db6f604137443053144dde94c9e553c0ef (diff) |
lok: Notify about the current editing context.
Change-Id: I47e67b680a6abdb66020b295f55ee6a73b7b5608
Reviewed-on: https://gerrit.libreoffice.org/62956
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/sidebar/ContextChangeBroadcaster.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/view/lokhelper.cxx | 9 |
2 files changed, 19 insertions, 0 deletions
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx index 716cb84fcfc4..3a182d14f368 100644 --- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx +++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx @@ -22,7 +22,10 @@ #include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <osl/diagnose.h> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> +#include <sfx2/lokhelper.hxx> +#include <sfx2/viewsh.hxx> using namespace css; using namespace css::uno; @@ -86,6 +89,13 @@ void ContextChangeBroadcaster::BroadcastContextChange ( return; } + // notify the LOK too + if (comphelper::LibreOfficeKit::isActive()) + { + if (SfxViewShell* pViewShell = SfxViewShell::Get(rxFrame->getController())) + SfxLokHelper::notifyContextChange(pViewShell, rsModuleName, rsContextName); + } + const css::ui::ContextChangeEventObject aEvent( rxFrame->getController(), rsModuleName, diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index 20481ac61e15..374abf900936 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -228,4 +228,13 @@ void SfxLokHelper::notifyAllViews(int nType, const OString& rPayload) } } +void SfxLokHelper::notifyContextChange(SfxViewShell const* pViewShell, const OUString& aApplication, const OUString& aContext) +{ + OStringBuffer aBuffer; + aBuffer.append(OUStringToOString(aApplication.replace(' ', '_'), RTL_TEXTENCODING_UTF8)); + aBuffer.append(' '); + aBuffer.append(OUStringToOString(aContext.replace(' ', '_'), RTL_TEXTENCODING_UTF8)); + pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CONTEXT_CHANGED, aBuffer.makeStringAndClear().getStr()); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |