[Libreoffice-commits] core.git: 8 commits - config_host.mk.in configure.ac include/LibreOfficeKit ios/experimental RepositoryExternal.mk svx/source sw/source vcl/headless vcl/ios vcl/Library_vcl.mk vcl/quartz

Tor Lillqvist tml at collabora.com
Wed Aug 17 15:23:06 UTC 2016 

 RepositoryExternal.mk                                                        |    2 -
 config_host.mk.in                                                            |    1 
 configure.ac                                                                 |    8 +++--
 include/LibreOfficeKit/LibreOfficeKitInit.h                                  |    8 ++---
 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj |    8 ++---
 ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m             |    3 +-
 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h               |    1 
 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m               |    1 
 ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h                    |    1 
 ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m                    |    1 
 svx/source/form/fmscriptingenv.cxx                                           |    2 +
 sw/source/core/crsr/crsrsh.cxx                                               |    8 -----
 vcl/Library_vcl.mk                                                           |   13 ++++----
 vcl/headless/svpbmp.cxx                                                      |    4 --
 vcl/headless/svpgdi.cxx                                                      |   14 ---------
 vcl/headless/svpinst.cxx                                                     |   15 ++++++++--
 vcl/ios/dummies.cxx                                                          |    5 +++
 vcl/quartz/salgdicommon.cxx                                                  |    8 ++---
 18 files changed, 51 insertions(+), 52 deletions(-)

New commits:
commit 53f9b5affe109342f1f6f02a2211fdd8b7047571
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 17 17:25:58 2016 +0300

    Drop some iOS-only code that seems unnecessary and in fact crashes now
    
    Change-Id: I146e340548830c18bc6737a723e0b4d3a684d1c9

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 1dc8702..509f3bf 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2655,10 +2655,6 @@ SwCursorShell::SwCursorShell( SwCursorShell& rShell, vcl::Window *pInitWin )
     m_bSetCursorInReadOnly = true;
     m_pVisibleCursor = new SwVisibleCursor( this );
     m_bMacroExecAllowed = rShell.IsMacroExecAllowed();
-
-#if defined(IOS)
-    HideCursor();
-#endif
 }
 
 /// default constructor
@@ -2706,10 +2702,6 @@ SwCursorShell::SwCursorShell( SwDoc& rDoc, vcl::Window *pInitWin,
 
     m_pVisibleCursor = new SwVisibleCursor( this );
     m_bMacroExecAllowed = true;
-
-#if defined(IOS)
-    HideCursor();
-#endif
 }
 
 SwCursorShell::~SwCursorShell()
commit a1d9ed56029b5c6e70500314719ddcfae848aca0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 17 16:26:58 2016 +0300

    We use a much newer ICU version now
    
    Change-Id: If631e7a4d3faabcce52e3c890faed5e649d2e967

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index ce3f01a..6c9960e 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		BE03BF9318F9A7CC00620DC7 /* icudt54l.dat in Resources */ = {isa = PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt54l.dat */; };
+		BE03BF9318F9A7CC00620DC7 /* icudt57l.dat in Resources */ = {isa = PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt57l.dat */; };
 		BE55B06D18D87CC600950228 /* DocumentTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE55B06C18D87CC600950228 /* DocumentTableViewController.m */; };
 		BE82BD7618218E2E00A447B5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE82BD7518218E2E00A447B5 /* Foundation.framework */; };
 		BE82BD7818218E2E00A447B5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE82BD7718218E2E00A447B5 /* CoreGraphics.framework */; };
@@ -39,7 +39,7 @@
 
 /* Begin PBXFileReference section */
 		BE03BF9118F9648F00620DC7 /* udata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = udata.cpp; path = ../../../workdir/UnpackedTarball/icu/source/common/udata.cpp; sourceTree = "<group>"; };
-		BE03BF9218F9A7CC00620DC7 /* icudt54l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt54l.dat; path = ../../../../workdir/UnpackedTarball/icu/source/data/in/icudt54l.dat; sourceTree = "<group>"; };
+		BE03BF9218F9A7CC00620DC7 /* icudt57l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt57l.dat; path = ../../../../workdir/UnpackedTarball/icu/source/data/in/icudt57l.dat; sourceTree = "<group>"; };
 		BE03BF9518FC1A1C00620DC7 /* xdictionary.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xdictionary.cxx; path = ../../../i18npool/source/breakiterator/xdictionary.cxx; sourceTree = "<group>"; };
 		BE0898E81860D42B0021A679 /* brand.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brand.cxx; path = ../../../vcl/source/app/brand.cxx; sourceTree = "<group>"; };
 		BE0898E91860D42B0021A679 /* dbggui.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbggui.cxx; path = ../../../vcl/source/app/dbggui.cxx; sourceTree = "<group>"; };
@@ -2241,7 +2241,7 @@
 				BEEEFDFE1860A82C00FBDE67 /* unorc */,
 				BEEE02D01860ABB700FBDE67 /* services */,
 				BEEEF9691860A25400FBDE67 /* test1.odt */,
-				BE03BF9218F9A7CC00620DC7 /* icudt54l.dat */,
+				BE03BF9218F9A7CC00620DC7 /* icudt57l.dat */,
 			);
 			name = Resources;
 			path = TiledLibreOffice;
@@ -2307,7 +2307,7 @@
 				BEEEFE041860A89100FBDE67 /* rc in Resources */,
 				BEEEFE051860A89100FBDE67 /* services.rdb in Resources */,
 				BEEE02D21860ABDB00FBDE67 /* share in Resources */,
-				BE03BF9318F9A7CC00620DC7 /* icudt54l.dat in Resources */,
+				BE03BF9318F9A7CC00620DC7 /* icudt57l.dat in Resources */,
 				BEEEFE061860A89100FBDE67 /* udkapi.rdb in Resources */,
 				BEEEFE071860A89100FBDE67 /* unorc in Resources */,
 				BEEE02D31860ABDB00FBDE67 /* services in Resources */,
commit 1c8e4f74c63312fca5898452fae4ba32268fce65
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 17 01:22:21 2016 +0300

    These 'inline' keywords are fairly pointless
    
    Change-Id: I1018ca4954282d0b62a254d509e29493588960c1

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h
index bbef7d5..aedc606 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -51,22 +51,22 @@ extern "C"
                       );
     }
 
-    inline char *lok_dlerror(void)
+    char *lok_dlerror(void)
     {
         return dlerror();
     }
 
-    inline void *lok_dlsym(void *Hnd, const char *pName)
+    void *lok_dlsym(void *Hnd, const char *pName)
     {
         return dlsym(Hnd, pName);
     }
 
-    inline int lok_dlclose(void *Hnd)
+    int lok_dlclose(void *Hnd)
     {
         return dlclose(Hnd);
     }
 
-    inline void extendUnoPath(const char *pPath)
+    void extendUnoPath(const char *pPath)
     {
         (void)pPath;
     }
commit cb87239694e17e014c345a231c0eb21cb121f6c2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 17 01:14:54 2016 +0300

    Use correct path to the build platform's services.rdb when cross-compiling
    
    Requires introducing LIBO_URE_MISC_FOLDER_FOR_BUILD.
    
    Change-Id: I133a7f73e48090f67764838b45de4fe8b7580efe

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0345edc..66208c2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3852,7 +3852,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
 	$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
 	$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
 	$(call gb_Rdb_get_target_for_build,saxparser) \
-	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
+	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER_FOR_BUILD)/services.rdb \
 	$(call gb_UnoApi_get_target,udkapi) \
 )
 endef
diff --git a/config_host.mk.in b/config_host.mk.in
index 7314216..f85bf53 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -349,6 +349,7 @@ export LIBO_URE_ETC_FOLDER=@LIBO_URE_ETC_FOLDER@
 export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@
 export LIBO_URE_LIB_FOLDER_FOR_BUILD=@LIBO_URE_LIB_FOLDER_FOR_BUILD@
 export LIBO_URE_MISC_FOLDER=@LIBO_URE_MISC_FOLDER@
+export LIBO_URE_MISC_FOLDER_FOR_BUILD=@LIBO_URE_MISC_FOLDER_FOR_BUILD@
 export LIBO_URE_SHARE_JAVA_FOLDER=@LIBO_URE_SHARE_JAVA_FOLDER@
 export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
 export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
diff --git a/configure.ac b/configure.ac
index cda5937..4263324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4748,9 +4748,9 @@ if test "$cross_compiling" = "yes"; then
     mv config.log ../config.Build.log
     mkdir -p ../config_build
     mv config_host/*.h ../config_build
-    . ./bin/get_config_variables CC CXX INSTDIR INSTROOT LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS PATH SDKDIRNAME SYSTEM_LIBXML SYSTEM_LIBXSLT WORKDIR
+    . ./bin/get_config_variables CC CXX INSTDIR INSTROOT LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER LIBO_URE_MISC_FOLDER OS PATH SDKDIRNAME SYSTEM_LIBXML SYSTEM_LIBXSLT WORKDIR
 
-    for V in CC CXX LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS SDKDIRNAME SYSTEM_LIBXML SYSTEM_LIBXSLT; do
+    for V in CC CXX LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER LIBO_URE_MISC_FOLDER OS SDKDIRNAME SYSTEM_LIBXML SYSTEM_LIBXSLT; do
         VV='$'$V
         VV=`eval "echo $VV"`
         if test -n "$VV"; then
@@ -4792,6 +4792,7 @@ else
     LIBO_BIN_FOLDER_FOR_BUILD="$LIBO_BIN_FOLDER"
     LIBO_LIB_FOLDER_FOR_BUILD="$LIBO_LIB_FOLDER"
     LIBO_URE_LIB_FOLDER_FOR_BUILD="$LIBO_URE_LIB_FOLDER"
+    LIBO_URE_MISC_FOLDER_FOR_BUILD="$LIBO_URE_MISC_FOLDER"
     SDKDIRNAME_FOR_BUILD="$SDKDIRNAME"
     WORKDIR_FOR_BUILD="$WORKDIR"
 fi
@@ -4801,6 +4802,7 @@ AC_SUBST(INSTROOT_FOR_BUILD)
 AC_SUBST(LIBO_BIN_FOLDER_FOR_BUILD)
 AC_SUBST(LIBO_LIB_FOLDER_FOR_BUILD)
 AC_SUBST(LIBO_URE_LIB_FOLDER_FOR_BUILD)
+AC_SUBST(LIBO_URE_MISC_FOLDER_FOR_BUILD)
 AC_SUBST(SDKDIRNAME_FOR_BUILD)
 AC_SUBST(WORKDIR_FOR_BUILD)
 
commit fb83fd9d22e07f8a12e5f54eea60440123125717
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 17 01:02:11 2016 +0300

    Massage ifdefs etc for iOS to avoid undefineds
    
    I think it's best to not use cairo on iOS, even if we do use it on
    Android. We probably want to use native APIs for the functionality
    that cairo would provide. Just like we do on OS X.
    
    No idea whether the resulting TiledLibreOffice will still work like it
    used to in May last year, when I last tried.
    
    Change-Id: Ie15cad6918d7a66e2aff7faabfcade7f3246b060

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 904f035..252d1c9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -534,14 +534,17 @@ endif
 endif
 
 vcl_headless_code= \
-    vcl/headless/svpbmp \
-    vcl/headless/svpdummies \
     vcl/headless/svpframe \
-    vcl/headless/svpgdi \
+    $(call gb_Helper_optional,CAIRO, \
+	    vcl/headless/svpbmp \
+		vcl/headless/svpgdi \
+	    vcl/headless/svpdata) \
+    vcl/headless/svpdummies \
     vcl/headless/svpinst \
-    vcl/headless/svpdata \
     vcl/headless/svpvd \
     vcl/unx/generic/app/gendisp \
+    vcl/unx/generic/app/geninst \
+    vcl/unx/generic/app/gensys \
 
 vcl_headless_freetype_code=\
     vcl/headless/svpprn \
@@ -568,8 +571,6 @@ vcl_headless_freetype_code=\
     vcl/unx/generic/print/genprnpsp \
     vcl/unx/generic/print/prtsetup \
     vcl/unx/generic/print/text_gfx \
-    vcl/unx/generic/app/gensys \
-    vcl/unx/generic/app/geninst \
 
 ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index f5dabae..202d63c 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef IOS
-
 #include <sal/config.h>
 
 #include <cstring>
@@ -267,6 +265,4 @@ bool SvpSalBitmap::Replace( const ::Color& /*rSearchColor*/, const ::Color& /*rR
     return false;
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index ed8cdc6..af454a9 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -20,9 +20,7 @@
 #include "headless/svpgdi.hxx"
 #include "headless/svpbmp.hxx"
 #include "headless/svpframe.hxx"
-#ifndef IOS
 #include "headless/svpcairotextrender.hxx"
-#endif
 #include "saldatabasic.hxx"
 
 #include <vcl/sysdata.hxx>
@@ -87,8 +85,6 @@ namespace
     }
 }
 
-#ifndef IOS
-
 bool SvpSalGraphics::blendBitmap( const SalTwoRect&, const SalBitmap& /*rBitmap*/ )
 {
     SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::blendBitmap case");
@@ -312,8 +308,6 @@ bool SvpSalGraphics::drawTransformedBitmap(
     return true;
 }
 
-#endif
-
 void SvpSalGraphics::clipRegion(cairo_t* cr)
 {
     RectangleVector aRectangles;
@@ -396,8 +390,6 @@ void SvpSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
     rDPIX = rDPIY = 96;
 }
 
-#ifndef IOS
-
 sal_uInt16 SvpSalGraphics::GetBitCount() const
 {
     if (CAIRO_FORMAT_A1 == cairo_image_surface_get_format(m_pSurface))
@@ -1219,8 +1211,6 @@ void SvpSalGraphics::invert(sal_uInt32 nPoints, const SalPoint* pPtAry, SalInver
     invert(aPoly, nFlags);
 }
 
-#endif
-
 bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
 {
     return false;
@@ -1395,8 +1385,6 @@ css::uno::Any SvpSalGraphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& /*
 
 #endif // ENABLE_CAIRO_CANVAS
 
-#ifndef IOS
-
 SystemGraphicsData SvpSalGraphics::GetGraphicsData() const
 {
     return SystemGraphicsData();
@@ -1413,6 +1401,4 @@ bool SvpSalGraphics::supportsOperation(OutDevSupportType eType) const
     return false;
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index d5caade..77b9ba5 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -62,7 +62,7 @@ bool SvpSalInstance::isFrameAlive( const SalFrame* pFrame ) const
 
 SvpSalInstance* SvpSalInstance::s_pDefaultInstance = nullptr;
 
-#ifndef ANDROID
+#if !defined(ANDROID) && !defined(IOS)
 
 static void atfork_child()
 {
@@ -82,11 +82,13 @@ SvpSalInstance::SvpSalInstance( SalYieldMutex *pMutex ) :
     m_aTimeout.tv_usec      = 0;
     m_nTimeoutMS            = 0;
 
+#ifndef IOS
     m_pTimeoutFDS[0] = m_pTimeoutFDS[1] = -1;
     CreateWakeupPipe(true);
+#endif
     if( s_pDefaultInstance == nullptr )
         s_pDefaultInstance = this;
-#ifndef ANDROID
+#if !defined(ANDROID) && !defined(IOS)
     pthread_atfork(nullptr, nullptr, atfork_child);
 #endif
 }
@@ -95,10 +97,13 @@ SvpSalInstance::~SvpSalInstance()
 {
     if( s_pDefaultInstance == this )
         s_pDefaultInstance = nullptr;
-
+#ifndef IOS
     CloseWakeupPipe(true);
+#endif
 }
 
+#ifndef IOS
+
 void SvpSalInstance::CloseWakeupPipe(bool log)
 {
     if (m_pTimeoutFDS[0] != -1)
@@ -158,6 +163,8 @@ void SvpSalInstance::CreateWakeupPipe(bool log)
     }
 }
 
+#endif
+
 void SvpSalInstance::PostEvent(const SalFrame* pFrame, ImplSVEvent* pData, SalEvent nEvent)
 {
     {
@@ -206,7 +213,9 @@ void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
 
 void SvpSalInstance::Wakeup()
 {
+#ifndef IOS
     OSL_VERIFY(write (m_pTimeoutFDS[1], "", 1) == 1);
+#endif
 }
 
 bool SvpSalInstance::CheckTimeout( bool bExecuteTimers )
diff --git a/vcl/ios/dummies.cxx b/vcl/ios/dummies.cxx
index bf73412..40fc867 100644
--- a/vcl/ios/dummies.cxx
+++ b/vcl/ios/dummies.cxx
@@ -124,4 +124,9 @@ void SalGenericInstance::jobEndedPrinterUpdate()
 {
 }
 
+bool AquaSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
+{
+    return false;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 4f90876..907bf08 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1544,10 +1544,9 @@ SalColor AquaSalGraphics::getPixel( long nX, long nY )
     return nSalColor;
 }
 
-#ifndef IOS
-
 void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
 {
+#ifndef IOS
     if( !mnRealDPIY )
     {
         initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
@@ -1555,9 +1554,10 @@ void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
 
     rDPIX = mnRealDPIX;
     rDPIY = mnRealDPIY;
-}
-
+#else
+    rDPIX = rDPIY = 200; // FIXME
 #endif
+}
 
 void AquaSalGraphics::ImplDrawPixel( long nX, long nY, const RGBAColor& rColor )
 {
commit f07b8e63fde24c04e0f496c356319440e03b4741
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 17 00:45:35 2016 +0300

    Surround use of StarBASIC with #if HAVE_FEATURE_SCRIPTING
    
    Change-Id: I996d5c9bf07a8cccb7790780f9772d512b155ffc

diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index b79d421..f66be66 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -790,7 +790,9 @@ namespace svxform
                 throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override
             {
                 mbQuitBlocked = true;
+#if HAVE_FEATURE_SCRIPTING
                 StarBASIC::Stop();
+#endif
                 throw css::frame::TerminationVetoException();
             }
 
commit a995d607efae4ce805f2122778456c88bc34d965
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 17 00:31:11 2016 +0300

    Adapt to LibreOfficeKit API changes, LOK_USE_UNSTABLE_API
    
    Change-Id: I7d83c90a8f3930f043101ed81b090dd38c43f986

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m b/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m
index addcccf..1b6d2be 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m
@@ -6,6 +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/.
 
+#define LOK_USE_UNSTABLE_API
 #include <LibreOfficeKit/LibreOfficeKitInit.h>
 
 #import "AppDelegate.h"
@@ -73,7 +74,7 @@ static LibreOfficeKitDocument* document;
     // kit = lok_init([[[NSBundle mainBundle] bundlePath] UTF8String]);
     kit = lok_init(NULL);
     document = kit->pClass->documentLoad(kit, [documentPath UTF8String]);
-    document->pClass->initializeForRendering(document);
+    document->pClass->initializeForRendering(document, "");
     vc.view = [[View alloc] initWithFrame:[self.window frame] kit:kit document:document];
 }
 
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h
index 0e5bc8a..d0d20c3 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h
@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
+#define LOK_USE_UNSTABLE_API
 #include <LibreOfficeKit/LibreOfficeKit.h>
 
 @interface TiledView : UIView
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
index 98e3025..6f1a4ea 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
@@ -8,6 +8,7 @@
 
 #include <CoreText/CoreText.h>
 
+#define LOK_USE_UNSTABLE_API
 #include <LibreOfficeKit/LibreOfficeKit.h>
 
 #import "View.h"
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h
index c426956..7fc3db8 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h
@@ -7,6 +7,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #import <UIKit/UIKit.h>
+#define LOK_USE_UNSTABLE_API
 #import <LibreOfficeKit/LibreOfficeKit.h>
 
 @interface View : UIScrollView <UIScrollViewDelegate>
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
index f553a5a..33690e1 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
@@ -6,6 +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/.
 
+#define LOK_USE_UNSTABLE_API
 #include <LibreOfficeKit/LibreOfficeKit.h>
 
 #import "View.h"
commit d97a4e5feb9cbed73f11d09171e4173bc6931f15
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 17 00:27:54 2016 +0300

    Why wouldn't we need liblangtag for iOS?
    
    Change-Id: I7bb75b17003a5a40f69da1f2db5f377d5f349c34

diff --git a/configure.ac b/configure.ac
index e71670e..cda5937 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11943,7 +11943,7 @@ ENABLE_LIBLANGTAG=
 SYSTEM_LIBLANGTAG=
 AC_MSG_CHECKING([whether to use liblangtag])
 if test "$enable_liblangtag" = "yes" -o \
-        \( "$enable_liblangtag" = "" -a $_os != iOS -a $_os != Emscripten \); then
+        \( "$enable_liblangtag" = "" -a $_os != Emscripten \); then
     ENABLE_LIBLANGTAG=TRUE
     AC_MSG_RESULT([yes])
     AC_MSG_CHECKING([whether to use system liblangtag])

More information about the Libreoffice-commits mailing list