diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2022-05-23 08:39:34 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-05-24 13:14:45 +0200 |
| commit | 3e4e9a7776422bbb1ab4d3b54025204787864f02 (patch) | |
| tree | dc958cb91bd28d9c4ceb94e5e12aeef39c0830b3 /desktop | |
| parent | c18db3c86257974770cd9e7c5aea221222c78667 (diff) | |
sw content controls, picture: add LOK API
- send a LOK_CALLBACK_CONTENT_CONTROL callback with
action=change-picture when a file picker should be shown
- extend lok::Document::sendContentControlEvent() to be able to replace
the placeholder with the selected URL
- update gtktiledviewer to work with these
(cherry picked from commit 9a76be53dfb801b754bf55f9d4b8c5f82991a62f)
Conflicts:
sw/source/uibase/uno/unotxdoc.cxx
Change-Id: Ifb3750803885fc09fc82905b0cf85b2b8ca06e77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134850
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index b5f823e492ef..d4e222c8fba9 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -6123,9 +6123,9 @@ static void doc_sendContentControlEvent(LibreOfficeKitDocument* pThis, const cha } // Sanity check - if (aMap.find("type") == aMap.end() || aMap.find("selected") == aMap.end()) + if (aMap.find("type") == aMap.end()) { - SetLastExceptionMsg("Wrong arguments for sendContentControlEvent"); + SetLastExceptionMsg("Missing 'type' argument for sendContentControlEvent"); return; } |