From 049d3f19736e912e711496fde54ea2b3d3c06e74 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 16 Apr 2012 23:57:57 +0300 Subject: [PATCH] More static UNO component linkage --- ios/qa/sc/Makefile | 2 +- ios/qa/sc/filters-test.m | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile index 3747e389b14d..bc9d5f5d7906 100644 --- a/ios/qa/sc/Makefile +++ b/ios/qa/sc/Makefile @@ -39,7 +39,7 @@ SRCS = filters-test.m CFLAGS = $(SOLARINC) -LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/i18npool.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata -licui18n -licuuc -ljpeg -ljvmfwk -llnglo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc +LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldatelo -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata -licui18n -licuuc -ljpeg -ljvmfwk -llnglo -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc all: $(APPDIR)/$(APP) stuff diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m index be329249b43b..65db932ee6d0 100644 --- a/ios/qa/sc/filters-test.m +++ b/ios/qa/sc/filters-test.m @@ -44,13 +44,21 @@ extern "C" { extern CppUnitTestPlugIn *cppunitTestPlugIn(void); extern int lo_main(int argc, const char **argv); +extern void * analysis_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); +extern void * date_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); +extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); +extern void * unoxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); const lib_to_component_mapping * lo_get_libmap(void) { static lib_to_component_mapping map[] = { + { "libanalysislo.a", analysis_component_getFactory }, + { "libdatelo.a", date_component_getFactory }, + { "libscfiltlo.a", scfilt_component_getFactory }, { "libsclo.a", sc_component_getFactory }, + { "libunoxmllo.a", unoxml_component_getFactory }, { NULL, NULL } };