mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

introduce property-tree versions of SfxLokHelper::notifyOtherView*()

Browse Source 
Change-Id: I4ebbc166da94eab6e35984c50220dde7daf7adde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98119
Tested-by: Jenkins
Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
This commit is contained in:
Dennis Francis
2020-06-02 11:51:52 +05:30
parent 06f1f8d817
commit 2f72fa980c
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/sfx2/lokhelper.hxx
View File

@@ -39,6 +39,8 @@ struct SFX2_DLLPUBLIC LokMouseEventData
{} {}
}; };
#include <boost/property_tree/ptree_fwd.hpp>
class SFX2_DLLPUBLIC SfxLokHelper class SFX2_DLLPUBLIC SfxLokHelper
{ {
public: public:
@@ -75,8 +77,12 @@ public:
static void forEachOtherView(ViewShellType* pThisViewShell, FunctionType f); static void forEachOtherView(ViewShellType* pThisViewShell, FunctionType f);
/// Invoke the LOK callback of all other views showing the same document as pThisView, with a payload of rKey-rPayload. /// Invoke the LOK callback of all other views showing the same document as pThisView, with a payload of rKey-rPayload.
static void notifyOtherViews(SfxViewShell* pThisView, int nType, const OString& rKey, const OString& rPayload); static void notifyOtherViews(SfxViewShell* pThisView, int nType, const OString& rKey, const OString& rPayload);
/// Invoke the LOK callback of all views except pThisView, with a JSON payload created from the given property tree.
static void notifyOtherViews(SfxViewShell* pThisView, int nType, const boost::property_tree::ptree& rTree);
/// Same as notifyOtherViews(), but works on a selected "other" view, not on all of them. /// Same as notifyOtherViews(), but works on a selected "other" view, not on all of them.
static void notifyOtherView(SfxViewShell* pThisView, SfxViewShell const* pOtherView, int nType, const OString& rKey, const OString& rPayload); static void notifyOtherView(SfxViewShell* pThisView, SfxViewShell const* pOtherView, int nType, const OString& rKey, const OString& rPayload);
/// Same as notifyOtherViews(), the property-tree version, but works on a selected "other" view, not on all of them.
static void notifyOtherView(SfxViewShell* pThisView, SfxViewShell const* pOtherView, int nType, const boost::property_tree::ptree& rTree);
/// Emits a LOK_CALLBACK_STATE_CHANGED /// Emits a LOK_CALLBACK_STATE_CHANGED
static void sendUnoStatus(const SfxViewShell* pShell, const SfxPoolItem* pItem); static void sendUnoStatus(const SfxViewShell* pShell, const SfxPoolItem* pItem);
/// Emits a LOK_CALLBACK_WINDOW /// Emits a LOK_CALLBACK_WINDOW

37
sfx2/source/view/lokhelper.cxx
View File

@@ -291,6 +291,16 @@ static OString lcl_escapeQuotes(const OString &rStr)
return aBuf.makeStringAndClear(); return aBuf.makeStringAndClear();
} }
static OString lcl_generateJSON(SfxViewShell* pView, const boost::property_tree::ptree& rTree)
{
boost::property_tree::ptree aMessageProps = rTree;
aMessageProps.put("viewId", SfxLokHelper::getView(pView));
aMessageProps.put("part", pView->getPart());
std::stringstream aStream;
boost::property_tree::write_json(aStream, aMessageProps, false /* pretty */);
return OString(aStream.str().c_str()).trim();
}
void SfxLokHelper::notifyOtherView(SfxViewShell* pThisView, SfxViewShell const* pOtherView, int nType, const OString& rKey, const OString& rPayload) void SfxLokHelper::notifyOtherView(SfxViewShell* pThisView, SfxViewShell const* pOtherView, int nType, const OString& rKey, const OString& rPayload)
{ {
if (DisableCallbacks::disabled()) if (DisableCallbacks::disabled())
@@ -303,6 +313,15 @@ void SfxLokHelper::notifyOtherView(SfxViewShell* pThisView, SfxViewShell const*
pOtherView->libreOfficeKitViewCallback(nType, aPayload.getStr()); pOtherView->libreOfficeKitViewCallback(nType, aPayload.getStr());
} }
void SfxLokHelper::notifyOtherView(SfxViewShell* pThisView, SfxViewShell const* pOtherView, int nType,
const boost::property_tree::ptree& rTree)
{
if (DisableCallbacks::disabled())
return;
pOtherView->libreOfficeKitViewCallback(nType, lcl_generateJSON(pThisView, rTree).getStr());
}
void SfxLokHelper::notifyOtherViews(SfxViewShell* pThisView, int nType, const OString& rKey, const OString& rPayload) void SfxLokHelper::notifyOtherViews(SfxViewShell* pThisView, int nType, const OString& rKey, const OString& rPayload)
{ {
if (DisableCallbacks::disabled()) if (DisableCallbacks::disabled())
@@ -318,6 +337,24 @@ void SfxLokHelper::notifyOtherViews(SfxViewShell* pThisView, int nType, const OS
} }
} }
void SfxLokHelper::notifyOtherViews(SfxViewShell* pThisView, int nType, const boost::property_tree::ptree& rTree)
{
if (SfxLokHelper::getViewsCount() <= 1 || DisableCallbacks::disabled())
return;
// Payload is only dependent on pThisView.
OString aPayload = lcl_generateJSON(pThisView, rTree);
SfxViewShell* pViewShell = SfxViewShell::GetFirst();
while (pViewShell)
{
if (pViewShell != pThisView)
pViewShell->libreOfficeKitViewCallback(nType, aPayload.getStr());
pViewShell = SfxViewShell::GetNext(*pViewShell);
}
}
namespace { namespace {
OUString lcl_getNameForSlot(const SfxViewShell* pShell, sal_uInt16 nWhich) OUString lcl_getNameForSlot(const SfxViewShell* pShell, sal_uInt16 nWhich)
{ {