ios/CustomTarget_iOS_prelink.mk | 6 ++----
ios/source/LibreOfficeKit.c | 9 ++++-----
ios/source/LibreOfficeKit.h | 14 ++++++++++++++
vcl/quartz/salgdicommon.cxx | 2 +-
4 files changed, 21 insertions(+), 10 deletions(-)
New commits:
commit 1dd5f10c3c6e0189ada4ecd6d08beb4c5fd1d42d
Author: jan Iversen <j...@libreoffice.org>
Date: Sat Jan 6 09:20:54 2018 +0100
iOS, correct DPIX calculation
Patch is thanks to Jon N.
Change-Id: Idba9ec9b32b144523f0e7da5f7273f6af9fdfd31
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 192bdc5aa47e..62b40f840bfc 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1542,7 +1542,7 @@ void AquaSalGraphics::GetResolution( sal_Int32& rDPIX,
sal_Int32& rDPIY )
rDPIX = mnRealDPIX;
rDPIY = mnRealDPIY;
#else
- rDPIX = rDPIY = 200; // FIXME
+ rDPIX = rDPIY = 96;
#endif
}
commit 72db74239a0853df72f323e756d304cb3e5dae02
Author: jan Iversen <j...@libreoffice.org>
Date: Fri Jan 5 22:53:57 2018 +0100
iOS, allow calls to LibreOfficeKit from swift
Extended the bridge to include original LibreOfficeKit.h
as well as Kit pointer (set in init call)
Change-Id: I5e96f2706ac4d1ee897b977d3322bdc1b91f1a0b
diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index 718a797f5a34..1d1e54f703a2 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -6,8 +6,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#- Env ------------------------------------------------------------------------
-IOSDEV = /Applications/Xcode.app/Contents/Developer/
-IOSLD = $(IOSDEV)Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+IOSLD =
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
ifeq ($(ENABLE_DEBUG),TRUE)
@@ -35,8 +34,7 @@ $(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge)
FORCE
-arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \
-o $(IOSOBJ) \
$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
- `$(SRCDIR)/bin/lo-all-static-libs` \
- $(call gb_StaticLibrary_get_target,iOS_kitBridge)
+ `$(SRCDIR)/bin/lo-all-static-libs`
$(AR) -r $(IOSKIT) $(IOSOBJ)
diff --git a/ios/source/LibreOfficeKit.c b/ios/source/LibreOfficeKit.c
index cdd1c09a8ed5..841c19ceff26 100644
--- a/ios/source/LibreOfficeKit.c
+++ b/ios/source/LibreOfficeKit.c
@@ -7,14 +7,13 @@
//
#include <stdio.h>
#include <TargetConditionals.h>
-#define LOK_USE_UNSTABLE_API
+#define LOK_USE_UNSTABLE_API 1
+#include "LibreOfficeKit.h"
+
#include <LibreOfficeKit/LibreOfficeKitInit.h>
#include <osl/process.h>
-//#include <unicode/udata.h>
-//#include <unicode/ucnv.h>
-
// generated by solenv/bin/native-code.py:
#include "native-code.h"
@@ -24,7 +23,7 @@ extern __attribute__((used)) void *libreofficekit_hook(const
char *);
static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook;
// pointers to our instance
-static LibreOfficeKit* kit;
+LibreOfficeKit* kit;
static LibreOfficeKitDocument* document;
diff --git a/ios/source/LibreOfficeKit.h b/ios/source/LibreOfficeKit.h
index 3c6498c06854..0f5ca6edc95f 100644
--- a/ios/source/LibreOfficeKit.h
+++ b/ios/source/LibreOfficeKit.h
@@ -18,3 +18,17 @@ int BridgeLOkit_open(const char *path);
int BridgeLOkit_ClientCommand(const char *input);
int BridgeLOkit_Hipernate(void);
int BridgeLOkit_LeaveHipernate(void);
+
+
+// Use LOK_USE_UNSTABLE_API to get access to the low level
+// LibreOfficeKit.
+// REMARK: There are no guarantee these functions will work !!
+// REMARK: BridgeLOkit_Init MUST be called, NOT the original init()
+
+#ifdef LOK_USE_UNSTABLE_API
+#include <LibreOfficeKit/LibreOfficeKit.h>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+
+extern LibreOfficeKit* kit;
+#endif
+
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
