diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-09-14 09:23:46 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-11-15 17:07:20 +0100 |
| commit | ab54d2213915ac48873e6952617cf0b23107dce3 (patch) | |
| tree | 4e6435864d1972243a86577c3a6e4b529a66d451 /include | |
| parent | 9d72a4752128e4b59dc545018886544dc7111898 (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')
| -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 792f5af9e4ab..7aa4ba91a8d3 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -12,10 +12,13 @@ #include <stddef.h> -#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY // the unstable API needs C99's bool -#include <stdbool.h> -#include <stdint.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 <LibreOfficeKit/LibreOfficeKitTypes.h> @@ -69,7 +72,7 @@ struct _LibreOfficeKitClass char* (*getFilterTypes) (LibreOfficeKit* pThis); /// @see lok::Office::setOptionalFeatures(). - void (*setOptionalFeatures)(LibreOfficeKit* pThis, uint64_t features); + void (*setOptionalFeatures)(LibreOfficeKit* pThis, unsigned long long features); /// @see lok::Office::setDocumentPassword(). void (*setDocumentPassword) (LibreOfficeKit* pThis, @@ -79,7 +82,7 @@ struct _LibreOfficeKitClass /// @see lok::Office::getVersionInfo(). char* (*getVersionInfo) (LibreOfficeKit* pThis); - bool (*runMacro) (LibreOfficeKit *pThis, const char* pURL); + int (*runMacro) (LibreOfficeKit *pThis, const char* pURL); #endif }; diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index d595b7f2dbf5..2e4486ee4d29 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -655,7 +655,7 @@ public: * * @see LibreOfficeKitOptionalFeatures */ - void setOptionalFeatures(uint64_t features) + void setOptionalFeatures(unsigned long long features) { return mpThis->pClass->setOptionalFeatures(mpThis, features); } |