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 /desktop | |
| parent | Adapt flatpak-manifest.in to updated poppler and libwpg (diff) | |
| download | core-5bcc79e825d542c40c9ee0f48d1d72ea9aa53c54.tar.gz core-5bcc79e825d542c40c9ee0f48d1d72ea9aa53c54.zip | |
[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 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/lib/lokandroid.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index ad88ab270252..6e8136d740a0 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1098,12 +1098,12 @@ 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); static char* lo_getVersionInfo(LibreOfficeKit* pThis); -static bool lo_runMacro (LibreOfficeKit* pThis, const char* pURL); +static int lo_runMacro (LibreOfficeKit* pThis, const char* pURL); LibLibreOffice_Impl::LibLibreOffice_Impl() : m_pOfficeClass( gOfficeClass.lock() ) @@ -1262,7 +1262,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; @@ -3014,7 +3014,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/desktop/source/lib/lokandroid.cxx b/desktop/source/lib/lokandroid.cxx index 3055d38957da..b85619d3dad8 100644 --- a/desktop/source/lib/lokandroid.cxx +++ b/desktop/source/lib/lokandroid.cxx @@ -163,7 +163,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Office_setOption { LibreOfficeKit* pLibreOfficeKit = getHandle<LibreOfficeKit>(pEnv, aObject); - uint64_t pOptions = (uint64_t)options; + unsigned long long pOptions = (unsigned long long)options; pLibreOfficeKit->pClass->setOptionalFeatures(pLibreOfficeKit, pOptions); } |