[Libreoffice-commits] core.git: 3 commits - include/osl ios/CustomTarget_MobileLibreOffice_app.mk ios/CustomTarget_TiledLibreOffice_app.mk ios/Executable_LibreOffice.mk ios/experimental ios/shared
Tor Lillqvist
tml at collabora.com
Wed Jan 1 08:40:09 PST 2014
include/osl/detail/component-declarations.h | 121 ---------------
include/osl/detail/component-mapping.h | 107 -------------
ios/CustomTarget_MobileLibreOffice_app.mk | 4
ios/CustomTarget_TiledLibreOffice_app.mk | 4
ios/Executable_LibreOffice.mk | 11 +
ios/experimental/LibreOffice/LibreOffice/lo.mm | 30 ---
ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm | 30 ---
ios/shared/ios_sharedlo/cxx/mlo.mm | 33 ----
8 files changed, 23 insertions(+), 317 deletions(-)
New commits:
commit 12603f99db2e0bb3412ba7868a9ab25dfb88f001
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Jan 1 18:39:01 2014 +0200
Use the same parameters to native-code.py as in TiledLibreOffice
Change-Id: If3c95562e292cb44bf9eb2de39dc66100a6fd066
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk
index 997ad10..25b044d 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -34,8 +34,8 @@ $(call gb_CustomTarget_get_target,ios/MobileLibreOffice): $(call gb_CustomTarget
#==============================================================================
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
$(SRCDIR)/solenv/bin/native-code.py \
- -g core -g writer_core \
- -s i18nsearch -s uui \
+ -g extended_core -g writer \
+ -s cui -s spl -s uui \
> $(SRCDIR)/ios/shared/ios_sharedlo/cxx/native-code.mm
$(call MobileLibreOfficeXcodeBuild, clean build)
commit cec169709529abdadaeb22467abdbd83fb636ea6
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Jan 1 18:37:02 2014 +0200
Need to have native-code.cxx as a separate file for the LibreOffice app
The executable of the LibreOffice app (which as such at the moment
doesn't work, since the tiled rendering changes) is built using
gbuild, and thus we can't generate the native-code snippet in the
CustomTarget that builds the app bundle, but need it already when
building the executable. This is one wayt to handle that.
Change-Id: Ifdab40c970e93b1f2608cefc637df8a8e5396efe
diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk
index f910114..719ff09 100644
--- a/ios/CustomTarget_LibreOffice_app.mk
+++ b/ios/CustomTarget_LibreOffice_app.mk
@@ -137,10 +137,6 @@ else
# Copy the Xcode project to BUILDDIR if SRCDIR!=BUILDDIR, so that one
# can then open it from there in Xcode.
$(call gb_CustomTarget_get_target,ios/LibreOffice_app) : $(gb_Helper_PHONY)
- $(SRCDIR)/solenv/bin/native-code.py \
- -g extended_core -g writer \
- -s cui -s spl -s uui \
- > $(SRCDIR)/ios/experimental/LibreOffice/LibreOffice/native-code.mm
if test $(SRCDIR) != $(BUILDDIR); then \
(cd $(SRCDIR) && tar cf - ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj) | (cd $(BUILDDIR) && tar xf -); \
fi
diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index 7327d38..6f63c28 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -21,6 +21,17 @@ $(eval $(call gb_Executable_use_system_darwin_frameworks,LibreOffice,\
UIKit \
))
+$(eval $(call gb_Executable_add_generated_cxxobjects,LibreOffice,\
+ CustomTarget/ios/LibreOffice/native-code \
+))
+
+$(call gb_CustomTarget_get_workdir,ios/LibreOffice)/native-code.cxx :
+ mkdir -p `dirname $@`
+ $(SRCDIR)/solenv/bin/native-code.py \
+ -g extended_core -g writer \
+ -s cui -s spl -s uui \
+ > $@
+
$(eval $(call gb_Executable_add_objcxxobjects,LibreOffice,\
ios/experimental/LibreOffice/LibreOffice/lo \
))
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index 3e69eb7..ca01ce0 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -15,9 +15,6 @@
#include <osl/process.h>
#include <touch/touch.h>
-// generated by solenv/bin/native-code.py:
-#include "native-code.mm"
-
extern "C"
void
lo_initialize(void)
commit 645fb66bbdf756cedbcbcfd8be59ce9f58b2e731
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Tue Dec 31 15:05:01 2013 +0100
Use native-code.py generated code also for iOS.
This allows us to get rid of component-declarations.h and
simplify component-mapping.h.
For new, converted, implementation_getFactories, adding one line into
native-code.py should be enough to make them available in application.
Change-Id: I042320e5b7f8a9aa9f02b77d2bdd07cf9a690ee6
diff --git a/include/osl/detail/component-declarations.h b/include/osl/detail/component-declarations.h
deleted file mode 100644
index b8fb658..0000000
--- a/include/osl/detail/component-declarations.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * 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/.
- */
-
-#ifndef INCLUDED_OSL_DETAIL_COMPONENT_DECLARATIONS_H
-#define INCLUDED_OSL_DETAIL_COMPONENT_DECLARATIONS_H
-
-#ifdef DISABLE_DYNLOADING
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void * analysis_component_getFactory( const char * , void * , void * );
-void * animcore_component_getFactory( const char * , void * , void * );
-void * avmedia_component_getFactory( const char * , void * , void * );
-void * basprov_component_getFactory( const char * , void * , void * );
-void * bootstrap_component_getFactory( const char * , void * , void * );
-void * chartcore_component_getFactory( const char * , void * , void * );
-void * comphelp_component_getFactory( const char * , void * , void * );
-void * configmgr_component_getFactory( const char * , void * , void * );
-void * cui_component_getFactory( const char * , void * , void * );
-void * date_component_getFactory( const char * , void * , void * );
-void * dba_component_getFactory( const char * , void * , void * );
-void * dbaxml_component_getFactory( const char * , void * , void * );
-void * deployment_component_getFactory( const char * , void * , void * );
-void * dlgprov_component_getFactory( const char * , void * , void * );
-void * embobj_component_getFactory( const char * , void * , void * );
-void * emboleobj_component_getFactory( const char * , void * , void * );
-void * evtatt_component_getFactory( const char * , void * , void * );
-void * filterconfig1_component_getFactory( const char * , void * , void * );
-void * frm_component_getFactory( const char * , void * , void * );
-void * fsstorage_component_getFactory( const char * , void * , void * );
-void * fwk_component_getFactory( const char * , void * , void * );
-void * fwl_component_getFactory( const char * , void * , void * );
-void * fwm_component_getFactory( const char * , void * , void * );
-void * hwp_component_getFactory( const char * , void * , void * );
-void * hyphen_component_getFactory( const char * , void * , void * );
-void * i18npool_component_getFactory( const char * , void * , void * );
-void * i18nsearch_component_getFactory( const char * , void * , void * );
-void * introspection_component_getFactory( const char * , void * , void * );
-void * lng_component_getFactory( const char * , void * , void * );
-void * lnth_component_getFactory( const char * , void * , void * );
-void * localebe1_component_getFactory( const char * , void * , void * );
-void * oox_component_getFactory( const char * , void * , void * );
-void * package2_component_getFactory( const char * , void * , void * );
-void * pricing_component_getFactory( const char * , void * , void * );
-void * protocolhandler_component_getFactory( const char * , void * , void * );
-void * reflection_component_getFactory( const char * , void * , void * );
-void * sb_component_getFactory( const char * , void * , void * );
-void * sc_component_getFactory( const char * , void * , void * );
-void * scd_component_getFactory( const char * , void * , void * );
-void * scfilt_component_getFactory( const char * , void * , void * );
-void * scriptframe_component_getFactory( const char * , void * , void * );
-void * sd_component_getFactory( const char * , void * , void * );
-void * sdd_component_getFactory( const char * , void * , void * );
-void * sfx_component_getFactory( const char * , void * , void * );
-void * sm_component_getFactory( const char * , void * , void * );
-void * smd_component_getFactory( const char * , void * , void * );
-void * sot_component_getFactory( const char * , void * , void * );
-void * spell_component_getFactory( const char * , void * , void * );
-void * spl_component_getFactory( const char * , void * , void * );
-void * stocservices_component_getFactory( const char * , void * , void * );
-void * stringresource_component_getFactory( const char * , void * , void * );
-void * svgfilter_component_getFactory( const char * , void * , void * );
-void * svl_component_getFactory( const char * , void * , void * );
-void * svt_component_getFactory( const char * , void * , void * );
-void * svx_component_getFactory( const char * , void * , void * );
-void * svxcore_component_getFactory( const char * , void * , void * );
-void * sw_component_getFactory( const char * , void * , void * );
-void * swd_component_getFactory( const char * , void * , void * );
-void * t602filter_component_getFactory( const char * , void * , void * );
-void * textfd_component_getFactory( const char * , void * , void * );
-void * tk_component_getFactory( const char * , void * , void * );
-void * ucb_component_getFactory( const char * , void * , void * );
-void * ucpexpand1_component_getFactory( const char * , void * , void * );
-void * ucpfile_component_getFactory( const char * , void * , void * );
-void * ucppkg1_component_getFactory( const char * , void * , void * );
-void * unordf_component_getFactory( const char * , void * , void * );
-void * unoxml_component_getFactory( const char * , void * , void * );
-void * utl_component_getFactory( const char * , void * , void * );
-void * uui_component_getFactory( const char * , void * , void * );
-void * vbaevents_component_getFactory( const char * , void * , void * );
-void * vbaswobj_component_getFactory( const char * , void * , void * );
-void * vcl_component_getFactory( const char * , void * , void * );
-void * wpftdraw_component_getFactory( const char * , void * , void * );
-void * wpftwriter_component_getFactory( const char * , void * , void * );
-void * writerfilter_component_getFactory( const char * , void * , void * );
-void * xmlfd_component_getFactory( const char * , void * , void * );
-void * xmlsecurity_component_getFactory( const char * , void * , void * );
-void * xo_component_getFactory( const char * , void * , void * );
-void * xof_component_getFactory( const char * , void * , void * );
-void * xstor_component_getFactory( const char * , void * , void * );
-
-void * com_sun_star_comp_extensions_xml_sax_FastParser( void * , void * );
-void * com_sun_star_comp_extensions_xml_sax_ParserExpat( void * , void * );
-void * com_sun_star_comp_stoc_DLLComponentLoader( void * , void * );
-void * com_sun_star_comp_stoc_ImplementationRegistration( void * , void * );
-void * com_sun_star_comp_stoc_NestedRegistry( void * , void * );
-void * com_sun_star_comp_stoc_ORegistryServiceManager( void * , void * );
-void * com_sun_star_comp_stoc_OServiceManager( void * , void * );
-void * com_sun_star_comp_stoc_OServiceManagerWrapper( void * , void * );
-void * com_sun_star_comp_stoc_SimpleRegistry( void * , void * );
-void * com_sun_star_extensions_xml_sax_Writer( void * , void * );
-void * com_sun_star_security_comp_stoc_AccessController( void * , void * );
-void * com_sun_star_security_comp_stoc_FilePolicy( void * , void * );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* DISABLE_DYNLOADING */
-
-#endif // INCLUDED_OSL_DETAIL_COMPONENT_DECLARATIONS_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/detail/component-mapping.h b/include/osl/detail/component-mapping.h
index b32d41b..ce82083 100644
--- a/include/osl/detail/component-mapping.h
+++ b/include/osl/detail/component-mapping.h
@@ -10,8 +10,6 @@
#ifndef INCLUDED_OSL_DETAIL_COMPONENT_MAPPING_H
#define INCLUDED_OSL_DETAIL_COMPONENT_MAPPING_H
-#include <osl/detail/component-declarations.h>
-
#ifdef DISABLE_DYNLOADING
#ifdef __cplusplus
@@ -43,111 +41,6 @@ const lib_to_constructor_mapping *lo_get_constructor_map(void);
}
#endif
-#define LO_CORE_FACTORY_MAP \
- { "libembobj.a", embobj_component_getFactory }, \
- { "libemboleobj.a", emboleobj_component_getFactory }, \
- { "libintrospectionlo.a", introspection_component_getFactory }, \
- { "libreflectionlo.a", reflection_component_getFactory }, \
- { "libstocserviceslo.a", stocservices_component_getFactory }, \
- { "libcomphelper.a", comphelp_component_getFactory }, \
- { "libconfigmgrlo.a", configmgr_component_getFactory }, \
- { "libdeployment.a", deployment_component_getFactory }, \
- { "libevtattlo.a", evtatt_component_getFactory }, \
- { "libfilterconfiglo.a", filterconfig1_component_getFactory }, \
- { "libfsstoragelo.a", fsstorage_component_getFactory }, \
- { "libfwklo.a", fwk_component_getFactory }, \
- { "libfwllo.a", fwl_component_getFactory }, \
- { "libhyphenlo.a", hyphen_component_getFactory }, \
- { "libi18npoollo.a", i18npool_component_getFactory }, \
- { "liblnglo.a", lng_component_getFactory }, \
- { "liblnthlo.a", lnth_component_getFactory }, \
- { "liblocalebe1lo.a", localebe1_component_getFactory }, \
- { "libooxlo.a", oox_component_getFactory }, \
- { "libpackage2.a", package2_component_getFactory }, \
- { "libsfxlo.a", sfx_component_getFactory }, \
- { "libsotlo.a", sot_component_getFactory }, \
- { "libspelllo.a", spell_component_getFactory }, \
- { "libsvllo.a", svl_component_getFactory }, \
- { "libsvtlo.a", svt_component_getFactory }, \
- { "libsvxlo.a", svx_component_getFactory }, \
- { "libtklo.a", tk_component_getFactory }, \
- { "libucb1.a", ucb_component_getFactory }, \
- { "libucpexpand1lo.a", ucpexpand1_component_getFactory }, \
- { "libucpfile1.a", ucpfile_component_getFactory }, \
- { "libunordflo.a", unordf_component_getFactory }, \
- { "libunoxmllo.a", unoxml_component_getFactory }, \
- { "libutllo.a", utl_component_getFactory }, \
- { "libvcllo.a", vcl_component_getFactory }, \
- { "libxmlsecurity.a", xmlsecurity_component_getFactory }, \
- { "libxolo.a", xo_component_getFactory }, \
- { "libxoflo.a", xof_component_getFactory }, \
- { "libxstor.a", xstor_component_getFactory }, \
-
-#define LO_EXTENDED_CORE_FACTORY_MAP \
- LO_CORE_FACTORY_MAP \
- { "libanimcorelo.a", animcore_component_getFactory }, \
- { "libavmedialo.a", avmedia_component_getFactory }, \
- { "libchartcorelo.a", chartcore_component_getFactory }, \
- { "libfilterconfiglo.a", filterconfig1_component_getFactory }, \
- { "libfrmlo.a", frm_component_getFactory }, \
- { "libfwklo.a", fwk_component_getFactory }, \
- { "libfwmlo.a", fwm_component_getFactory }, \
- { "libsvxcorelo.a", svxcore_component_getFactory }, \
- { "libtextfdlo.a", textfd_component_getFactory }, \
- { "libtklo.a", tk_component_getFactory }, \
- { "libucppkg1.a", ucppkg1_component_getFactory }, \
- { "libxmlfdlo.a", xmlfd_component_getFactory }, \
-
-#define LO_BASE_CORE_FACTORY_MAP \
- { "libdbalo.a", dba_component_getFactory }, \
- { "libdbaxmllo.a", dbaxml_component_getFactory }, \
-
-#define LO_CALC_CORE_FACTORY_MAP \
- { "libscdlo.a", scd_component_getFactory }, \
- { "libscfiltlo.a", scfilt_component_getFactory }, \
- { "libsclo.a", sc_component_getFactory }, \
-
-#define LO_CALC_FACTORY_MAP \
- LO_CALC_CORE_FACTORY_MAP \
- { "libanalysislo.a", analysis_component_getFactory }, \
- { "libdatelo.a", date_component_getFactory }, \
- { "libpricinglo.a", pricing_component_getFactory }, \
-
-#define LO_DRAW_CORE_FACTORY_MAP \
- { "libsddlo.a", sdd_component_getFactory }, \
- { "libsdlo.a", sd_component_getFactory }, \
- { "libsvgfilterlo.a", svgfilter_component_getFactory }, \
- { "libwpftdrawlo.a", wpftdraw_component_getFactory }, \
-
-#define LO_MATH_FACTORY_MAP \
- { "libsmdlo.a", smd_component_getFactory }, \
- { "libsmlo.a", sm_component_getFactory }, \
-
-#define LO_WRITER_CORE_FACTORY_MAP \
- { "libswdlo.a", swd_component_getFactory }, \
- { "libswlo.a", sw_component_getFactory }, \
- { "libwriterfilterlo.a", writerfilter_component_getFactory }, \
-
-#define LO_WRITER_FACTORY_MAP \
- LO_WRITER_CORE_FACTORY_MAP \
- { "libhwplo.a", hwp_component_getFactory }, \
- { "libt602filterlo.a", t602filter_component_getFactory }, \
- { "libwpftwriterlo.a", wpftwriter_component_getFactory }, \
-
-#define NON_APP_SPECIFIC_CONSTRUCTOR_MAP \
- { "com_sun_star_comp_extensions_xml_sax_ParserExpat", com_sun_star_comp_extensions_xml_sax_ParserExpat }, \
- { "com_sun_star_comp_extensions_xml_sax_FastParser", com_sun_star_comp_extensions_xml_sax_FastParser }, \
- { "com_sun_star_comp_stoc_DLLComponentLoader", com_sun_star_comp_stoc_DLLComponentLoader }, \
- { "com_sun_star_comp_stoc_ImplementationRegistration", com_sun_star_comp_stoc_ImplementationRegistration }, \
- { "com_sun_star_comp_stoc_NestedRegistry", com_sun_star_comp_stoc_NestedRegistry }, \
- { "com_sun_star_comp_stoc_ORegistryServiceManager", com_sun_star_comp_stoc_ORegistryServiceManager }, \
- { "com_sun_star_comp_stoc_OServiceManager", com_sun_star_comp_stoc_OServiceManager }, \
- { "com_sun_star_comp_stoc_OServiceManagerWrapper", com_sun_star_comp_stoc_OServiceManagerWrapper }, \
- { "com_sun_star_comp_stoc_SimpleRegistry", com_sun_star_comp_stoc_SimpleRegistry }, \
- { "com_sun_star_extensions_xml_sax_Writer", com_sun_star_extensions_xml_sax_Writer }, \
- { "com_sun_star_security_comp_stoc_AccessController", com_sun_star_security_comp_stoc_AccessController }, \
- { "com_sun_star_security_comp_stoc_FilePolicy", com_sun_star_security_comp_stoc_FilePolicy }, \
-
#endif /* DISABLE_DYNLOADING */
#endif // INCLUDED_OSL_DETAIL_COMPONENT_MAPPING_H
diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk
index 719ff09..f910114 100644
--- a/ios/CustomTarget_LibreOffice_app.mk
+++ b/ios/CustomTarget_LibreOffice_app.mk
@@ -137,6 +137,10 @@ else
# Copy the Xcode project to BUILDDIR if SRCDIR!=BUILDDIR, so that one
# can then open it from there in Xcode.
$(call gb_CustomTarget_get_target,ios/LibreOffice_app) : $(gb_Helper_PHONY)
+ $(SRCDIR)/solenv/bin/native-code.py \
+ -g extended_core -g writer \
+ -s cui -s spl -s uui \
+ > $(SRCDIR)/ios/experimental/LibreOffice/LibreOffice/native-code.mm
if test $(SRCDIR) != $(BUILDDIR); then \
(cd $(SRCDIR) && tar cf - ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj) | (cd $(BUILDDIR) && tar xf -); \
fi
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk
index dcf20d9..997ad10 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -33,6 +33,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/MobileLibreOffice))
$(call gb_CustomTarget_get_target,ios/MobileLibreOffice): $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig) MobileLibreOffice_setup
#==============================================================================
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
+ $(SRCDIR)/solenv/bin/native-code.py \
+ -g core -g writer_core \
+ -s i18nsearch -s uui \
+ > $(SRCDIR)/ios/shared/ios_sharedlo/cxx/native-code.mm
$(call MobileLibreOfficeXcodeBuild, clean build)
#==============================================================================
diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk
index 44cacf5..7a280e2 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -28,6 +28,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/TiledLibreOffice))
# Depend on the custom target that sets up lo.xcconfig
$(call gb_CustomTarget_get_target,ios/TiledLibreOffice): $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig) TiledLibreOffice_setup
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
+ $(SRCDIR)/solenv/bin/native-code.py \
+ -g extended_core -g writer \
+ -s cui -s spl -s uui \
+ > $(SRCDIR)/ios/experimental/TiledLibreOffice/TiledLibreOffice/native-code.mm
$(call TiledLibreOfficeXcodeBuild, clean build)
# Setup
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index 04760a7..3e69eb7 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -12,38 +12,11 @@
#import <UIKit/UIKit.h>
#include <postmac.h>
-#include <osl/detail/component-mapping.h>
#include <osl/process.h>
#include <touch/touch.h>
-extern "C"
-const lib_to_factory_mapping *
-lo_get_factory_map(void)
-{
- static lib_to_factory_mapping map[] = {
- LO_EXTENDED_CORE_FACTORY_MAP
- LO_WRITER_FACTORY_MAP
- { "libcuilo.a", cui_component_getFactory },
- { "libspllo.a", spl_component_getFactory },
- { "libsvtlo.a", svt_component_getFactory },
- { "libuuilo.a", uui_component_getFactory },
- { NULL, NULL }
- };
-
- return map;
-}
-
-extern "C"
-const lib_to_constructor_mapping *
-lo_get_constructor_map(void)
-{
- static lib_to_constructor_mapping map[] = {
- NON_APP_SPECIFIC_CONSTRUCTOR_MAP
- { NULL, NULL }
- };
-
- return map;
-}
+// generated by solenv/bin/native-code.py:
+#include "native-code.mm"
extern "C"
void
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index 755ff1a..09cdc95 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -12,37 +12,11 @@
#import <UIKit/UIKit.h>
#include <postmac.h>
-#include <osl/detail/component-mapping.h>
#include <osl/process.h>
#include <touch/touch.h>
-extern "C"
-const lib_to_factory_mapping *
-lo_get_factory_map(void)
-{
- static lib_to_factory_mapping map[] = {
- LO_EXTENDED_CORE_FACTORY_MAP
- LO_WRITER_FACTORY_MAP
- { "libcuilo.a", cui_component_getFactory },
- { "libspllo.a", spl_component_getFactory },
- { "libuuilo.a", uui_component_getFactory },
- { NULL, NULL }
- };
-
- return map;
-}
-
-extern "C"
-const lib_to_constructor_mapping *
-lo_get_constructor_map(void)
-{
- static lib_to_constructor_mapping map[] = {
- NON_APP_SPECIFIC_CONSTRUCTOR_MAP
- { NULL, NULL }
- };
-
- return map;
-}
+// generated by solenv/bin/native-code.py:
+#include "native-code.mm"
static NSString *createPaths(NSString *base, NSString *appRootEscaped, NSArray *fileNames)
{
diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm b/ios/shared/ios_sharedlo/cxx/mlo.mm
index 8095b2a..4279d0d 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -13,41 +13,12 @@
#import <UIKit/UIKit.h>
#include <postmac.h>
-#include <osl/detail/component-mapping.h>
#include <touch/touch.h>
#undef TimeValue
#include <osl/process.h>
-#define MAP_LIB(LIB) { "lib" #LIB ".a", LIB##_component_getFactory }
-#define MAP_LIB_LO(LIB) { "lib" #LIB "lo.a", LIB##_component_getFactory }
-#define MAP_LIB_LO_1(LIB) { "lib" #LIB "lo.a", LIB##1_component_getFactory }
-
-extern "C"
-const lib_to_factory_mapping *
-lo_get_factory_map(void)
-{
- static lib_to_factory_mapping map[] = {
- LO_CORE_FACTORY_MAP
- LO_WRITER_CORE_FACTORY_MAP
- MAP_LIB_LO(uui),
- MAP_LIB_LO(i18nsearch),
- { NULL, NULL }
- };
-
- return map;
-}
-
-extern "C"
-const lib_to_constructor_mapping *
-lo_get_constructor_map(void)
-{
- static lib_to_constructor_mapping map[] = {
- NON_APP_SPECIFIC_CONSTRUCTOR_MAP
- { NULL, NULL }
- };
-
- return map;
-}
+// generated by solenv/bin/native-code.py:
+#include "native-code.mm"
NSString * createPaths(NSString * base,NSString * appRootEscaped,NSArray * fileNames){
NSString * prefix = @"file://";
More information about the Libreoffice-commits
mailing list