diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-11-14 18:45:02 +0530 |
|---|---|---|
| committer | pranavk <pranavk@collabora.co.uk> | 2017-11-15 13:46:16 +0100 |
| commit | 43540adb76f764522344c5d66ebc63f7cb0f9c1c (patch) | |
| tree | 23545b82a08ae2a17ee7b2f42aa9652391b7a5ea /sfx2 | |
| parent | a088f9e729084f950ee58afb8f80e64d4d134144 (diff) | |
lokdialog: Expose cursor visible status
Change the notifyDialog API a bit. Use a std::vector to keep track of
each payload item that needs to be fed to the resulting JSON.
Change-Id: If3229a88d2df5368e14290a0e80ebe6206780639
Reviewed-on: https://gerrit.libreoffice.org/44722
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/lokhelper.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index 633e221e4f86..33464711852f 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -144,7 +144,9 @@ void SfxLokHelper::notifyOtherViews(SfxViewShell* pThisView, int nType, const OS } } -void SfxLokHelper::notifyDialog(const OUString& rDialogID, const OUString& rAction, const tools::Rectangle* rRect) +void SfxLokHelper::notifyDialog(const OUString& rDialogID, + const OUString& rAction, + const std::vector<vcl::LOKPayloadItem>& rPayload) { if (SfxLokHelper::getViewsCount() <= 0 || rDialogID.isEmpty()) return; @@ -152,9 +154,15 @@ void SfxLokHelper::notifyDialog(const OUString& rDialogID, const OUString& rActi SfxViewShell* pViewShell = SfxViewShell::GetFirst(); OString aPayload = OString("{ \"dialogId\": \"") + OUStringToOString(rDialogID, RTL_TEXTENCODING_UTF8).getStr() + OString("\""); aPayload += OString(", \"action\": \"") + OUStringToOString(rAction, RTL_TEXTENCODING_UTF8).getStr() + OString("\""); - if (!rAction.isEmpty() && rRect && !rRect->IsEmpty()) - aPayload += OString(", \"rectangle\": \"") + rRect->toString() + OString("\""); + for (const auto& rItem: rPayload) + { + if (!rItem.first.isEmpty() && !rItem.second.isEmpty()) + { + aPayload += OString(", \"") + rItem.first + OString("\": \"") + + rItem.second + OString("\""); + } + } aPayload += "}"; while (pViewShell) |