diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-09-14 09:23:46 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-09-14 09:50:54 +0200 |
| commit | 5bcc79e825d542c40c9ee0f48d1d72ea9aa53c54 (patch) | |
| tree | a45c03a991aa2ee92cf9d439f77c6d60a19a3276 /include/LibreOfficeKit | |
| parent | be78f7b8e202105625ff750853851b93f5a61ddf (diff) | |
[API CHANGE] lok: Don't use 'bool' and 'uint64_t' in the stable API.
This is a f70e0ec6b3c61a7c7caa469949b0ac8016c89854 follow-up.
Change-Id: I4acf00a6da85ed14be4ed0ca20d541a9441736e7
Reviewed-on: https://gerrit.libreoffice.org/42266
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'include/LibreOfficeKit')
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.h | 13 | ||||
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.hxx | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index 34b67ac092b1..0633f46f97e2 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -12,11 +12,14 @@ #include <stddef.h> -#ifndef _WIN32 // the unstable API needs C99's bool -# include <stdbool.h> +// TODO remove the C99 types from the API before making stable +#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY +# ifndef _WIN32 +# include <stdbool.h> +# endif +# include <stdint.h> #endif -#include <stdint.h> #include <LibreOfficeKit/LibreOfficeKitTypes.h> @@ -73,7 +76,7 @@ struct _LibreOfficeKitClass /** @see lok::Office::setOptionalFeatures(). @since LibreOffice 6.0 */ - void (*setOptionalFeatures)(LibreOfficeKit* pThis, uint64_t features); + void (*setOptionalFeatures)(LibreOfficeKit* pThis, unsigned long long features); /** @see lok::Office::setDocumentPassword(). @since LibreOffice 6.0 @@ -90,7 +93,7 @@ struct _LibreOfficeKitClass /** @see lok::Office::runMacro(). @since LibreOffice 6.0 */ - bool (*runMacro) (LibreOfficeKit *pThis, const char* pURL); + int (*runMacro) (LibreOfficeKit *pThis, const char* pURL); }; #define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member) LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocumentClass,member,(pDoc)->pClass->nSize) diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index 18122a7e3b05..10e0f0f199d0 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -554,7 +554,7 @@ public: * @since LibreOffice 6.0 * @see LibreOfficeKitOptionalFeatures */ - void setOptionalFeatures(uint64_t features) + void setOptionalFeatures(unsigned long long features) { return mpThis->pClass->setOptionalFeatures(mpThis, features); } |