diff options
| -rw-r--r-- | desktop/source/lib/init.cxx | 8 | ||||
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.h | 13 | ||||
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.hxx | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 78688ddc4e8c..88d5201ea123 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1286,7 +1286,7 @@ static void doc_destroy(LibreOfficeKitDocument *pThis) static void lo_destroy (LibreOfficeKit* pThis); static int lo_initialize (LibreOfficeKit* pThis, const char* pInstallPath, const char* pUserProfilePath); static LibreOfficeKitDocument* lo_documentLoad (LibreOfficeKit* pThis, const char* pURL); -static bool lo_runMacro (LibreOfficeKit* pThis, const char* pURL); +static int lo_runMacro (LibreOfficeKit* pThis, const char* pURL); static char * lo_getError (LibreOfficeKit* pThis); static void lo_freeError (char* pFree); static LibreOfficeKitDocument* lo_documentLoadWithOptions (LibreOfficeKit* pThis, @@ -1296,7 +1296,7 @@ static void lo_registerCallback (LibreOfficeKit* pThis, LibreOfficeKitCallback pCallback, void* pData); static char* lo_getFilterTypes(LibreOfficeKit* pThis); -static void lo_setOptionalFeatures(LibreOfficeKit* pThis, uint64_t features); +static void lo_setOptionalFeatures(LibreOfficeKit* pThis, unsigned long long features); static void lo_setDocumentPassword(LibreOfficeKit* pThis, const char* pURL, const char* pPassword); @@ -1465,7 +1465,7 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis, return nullptr; } -static bool lo_runMacro( LibreOfficeKit* pThis, const char *pURL) +static int lo_runMacro(LibreOfficeKit* pThis, const char *pURL) { SolarMutexGuard aGuard; @@ -3367,7 +3367,7 @@ static char* lo_getFilterTypes(LibreOfficeKit* pThis) return strdup(aStream.str().c_str()); } -static void lo_setOptionalFeatures(LibreOfficeKit* pThis, uint64_t const features) +static void lo_setOptionalFeatures(LibreOfficeKit* pThis, unsigned long long const features) { SolarMutexGuard aGuard; 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); } |