[Libreoffice-commits] core.git: 2 commits - distro-configs/LibreOfficeiOS.conf ios/experimental

[Tor Lillqvist]

 distro-configs/LibreOfficeiOS.conf             |    2 ++
 ios/experimental/LibreOffice/LibreOffice/lo.mm |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a3892f465b426c0c4f452398792db370c6dc0b10
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Apr 24 18:13:03 2013 +0300

    Bin lotuswordpro_component_getFactory
    
    Not suitably licensed.
    
    Change-Id: I221cccb9d2ff5b6cb5e25161b6d5bfe504acb10e

diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index 11ecaa3..bbd5bce 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -33,7 +33,6 @@ extern "C" {
     extern void * hyphen_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * lng_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lotuswordpro_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * pricing_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -83,7 +82,6 @@ lo_get_libmap(void)
         { "libhyphenlo.a", hyphen_component_getFactory },
         { "liblnglo.a", lng_component_getFactory },
         { "liblnthlo.a", lnth_component_getFactory },
-        { "liblwpftlo.a", lotuswordpro_component_getFactory },
         { "libooxlo.a", oox_component_getFactory },
         { "libpricinglo.a", pricing_component_getFactory },
         { "libscdlo.a", scd_component_getFactory },
commit 4c35d7b943d171b85194cff7a1101a2ca957d477
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Apr 24 16:01:53 2013 +0300

    Add --enable-mpl-subset --disable-lotuswordpro
    
    Change-Id: I648e5c23704125e939eceda9ac29217f1c63cd47

diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 61a67bb..ef1940f 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -8,6 +8,7 @@
 --disable-gstreamer-0-10
 --disable-gstreamer
 --disable-lockdown
+--disable-lotuswordpro
 --disable-odk
 --disable-opengl
 --disable-postgresql-sdbc
@@ -16,6 +17,7 @@
 --disable-randr-link
 --disable-systray
 --disable-vba
+--enable-mpl-subset
 --without-afms
 --without-fonts
 --without-java