From f59e986d0dc04a2d62cc1f236acedfcf727449ce Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Sat, 20 Jul 2019 10:43:39 +0100 Subject: lok: clipboard: per view clipboard creation. A bit brutal, but the mess around clipboard instantiation is awful. Change-Id: I62d6af8bf6813e6bab81123417ea8bfb28394e29 --- include/LibreOfficeKit/LibreOfficeKit.h | 4 ++-- include/LibreOfficeKit/LibreOfficeKit.hxx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index abdc9863c1f0..93b430f5da0b 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -390,8 +390,8 @@ struct _LibreOfficeKitDocumentClass const int width, const int height); /// Pass a nullptr terminated array of mime-type strings - /// @see lok::Document::getSelection for more details - int (*getSelection) (LibreOfficeKitDocument* pThis, + /// @see lok::Document::getClipboard for more details + int (*getClipboard) (LibreOfficeKitDocument* pThis, const char **pMimeTypes, size_t *pOutCount, char ***pOutMimeTypes, diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index f38d2b5109f6..bd6609c321a4 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -362,7 +362,7 @@ public: } /** - * Gets the selected content for the current view as a series of binary streams. + * Gets the content on the clipboard for the current view as a series of binary streams. * * NB. returns a complete set of possible selection types if nullptr is passed for pMimeTypes. * @@ -374,13 +374,13 @@ public: * * @returns: true on success, false on error. */ - bool getSelection(const char **pMimeTypes, + bool getClipboard(const char **pMimeTypes, size_t *pOutCount, char ***pOutMimeTypes, size_t **pOutSizes, char ***pOutStreams) { - return mpDoc->pClass->getSelection(mpDoc, pMimeTypes, pOutCount, pOutMimeTypes, pOutSizes, pOutStreams); + return mpDoc->pClass->getClipboard(mpDoc, pMimeTypes, pOutCount, pOutMimeTypes, pOutSizes, pOutStreams); } /** -- cgit