[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - kit/DummyLibreOfficeKit.cpp tools/KitClient.cpp
Aron Budea
aron.budea at collabora.com
Wed Nov 15 21:13:11 UTC 2017
kit/DummyLibreOfficeKit.cpp | 4 ++--
tools/KitClient.cpp | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit a72faa0460e308c227a9f0fb684d943e2ef78398
Author: Aron Budea <aron.budea at collabora.com>
Date: Sun Sep 24 19:25:21 2017 +0200
Adapt to lok API CHANGE in core
Introduced in commit 5bcc79e825d542c40c9ee0f48d1d72ea9aa53c54.
Change-Id: I1f2bf27f45f7e62f96fc5059e02386b1c884b3e6
Reviewed-on: https://gerrit.libreoffice.org/42713
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/kit/DummyLibreOfficeKit.cpp b/kit/DummyLibreOfficeKit.cpp
index cad7aec1..891ac6ed 100644
--- a/kit/DummyLibreOfficeKit.cpp
+++ b/kit/DummyLibreOfficeKit.cpp
@@ -180,7 +180,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);
@@ -534,7 +534,7 @@ static char* lo_getFilterTypes(LibreOfficeKit* pThis)
return nullptr;
}
-static void lo_setOptionalFeatures(LibreOfficeKit* pThis, uint64_t const features)
+static void lo_setOptionalFeatures(LibreOfficeKit* pThis, unsigned long long const features)
{
(void) pThis;
(void) features;
diff --git a/tools/KitClient.cpp b/tools/KitClient.cpp
index ab77cff9..d03d81be 100644
--- a/tools/KitClient.cpp
+++ b/tools/KitClient.cpp
@@ -79,6 +79,8 @@ extern "C"
CASE(INVALIDATE_HEADER);
CASE(CELL_ADDRESS);
CASE(RULER_UPDATE);
+ CASE(DIALOG);
+ CASE(DIALOG_CHILD);
#undef CASE
}
std::cout << " payload: " << payload << std::endl;
More information about the Libreoffice-commits
mailing list