cppuhelper/source/shlib.cxx | 8 ++++++++ ios/qa/sc/Makefile | 2 +- ios/qa/sc/filters-test.m | 8 ++++++++ sal/osl/unx/module.cxx | 2 +- scaddins/source/analysis/analysishelper.hxx | 17 +++++++++++++++++ stoc/source/corereflection/crefl.cxx | 4 ++++ stoc/source/inspect/introspection.cxx | 4 ++++ 7 files changed, 43 insertions(+), 2 deletions(-)
New commits: commit 049d3f19736e912e711496fde54ea2b3d3c06e74 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Apr 16 23:57:57 2012 +0300 More static UNO component linkage diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile index 3747e38..bc9d5f5 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 -l xolo -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 be32924..65db932 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 } }; commit c92e66c38a75353f2cf88270f7ff673c3f9232b2 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Apr 16 23:57:45 2012 +0300 More static UNO component linkage diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index ba8ea8d..04e9bf2 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -466,10 +466,14 @@ extern "C" extern void * bootstrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * configmgr_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * comphelp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * expwrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * filterconfig1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * fwk_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * introspection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * package2_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * reflection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sfx_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * svl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * stocservices_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * i18npool_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * ucb_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); @@ -537,16 +541,20 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( static lib_to_component_mapping non_app_specific_map[] = { { "bootstrap.uno" SAL_DLLEXTENSION, bootstrap_component_getFactory }, { "configmgr.uno.a", configmgr_component_getFactory }, + { "expwrap.uno.a", expwrap_component_getFactory }, + { "introspection.uno.a", introspection_component_getFactory }, { "i18npool.uno.a", i18npool_component_getFactory }, { "libcomphelp" CPPU_STRINGIFY(CPPU_ENV) ".a", comphelp_component_getFactory }, { "libfilterconfiglo.a", filterconfig1_component_getFactory }, { "libfwklo.a", fwk_component_getFactory }, { "libpackage2.a", package2_component_getFactory }, { "libsfxlo.a", sfx_component_getFactory }, + { "libsvllo.a", svl_component_getFactory }, { "libucb1.a", ucb_component_getFactory }, { "libucpfile1.a", ucpfile_component_getFactory }, { "libutllo.a", utl_component_getFactory }, { "libxstor.a", xstor_component_getFactory }, + { "reflection.uno.a", reflection_component_getFactory }, { "stocservices.uno.a", stocservices_component_getFactory }, { NULL, NULL } }; commit cc3d8ac247090d54815abc0a9e68558de133a7e0 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Apr 16 23:37:12 2012 +0300 More informative warning message diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx index e430cd3..a68a105 100644 --- a/sal/osl/unx/module.cxx +++ b/sal/osl/unx/module.cxx @@ -176,7 +176,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR #else /* DISABLE_DYNLOADING */ (void) nRtldMode; - printf("No DL Functions\n"); + fprintf(stderr, "No DL Functions, osl_loadModuleAscii(%s) does nothing\n", pModuleName); #endif /* DISABLE_DYNLOADING */ } return NULL; commit 5c61f5d8948cae3e8251f38359c2da4e29c32c4e Author: Tor Lillqvist <t...@iki.fi> Date: Mon Apr 16 23:36:31 2012 +0300 Deduplicate some functions for iOS static linking (DISABLE_DYNLOADING) diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 82b5db3..136a6e3 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -58,6 +58,23 @@ class ScaAnyConverter; inline sal_Bool IsLeapYear( sal_uInt16 nYear ); + +#ifdef DISABLE_DYNLOADING + +// Avoid clash with the functions with same name in +// scaddins/source/datefunc/datefunc.cxx. I am not sure if each pair +// have identical semantics, but if yes, one copy should be enough, +// but what would be a suitable library where such functions could go? +// Or can the analysis library depend on the date library or the other +// way around? + +#define DaysInMonth analysishelper_DaysInMonth +#define DateToDays analysishelper_DateToDays +#define DaysToDate analysishelper_DaysToDate +#define GetNullDate analysishelper_GetNullDate + +#endif + sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear ); sal_Int32 DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear ); void DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt16& rYear ) throw( ::com::sun::star::lang::IllegalArgumentException ); commit cfdeb0895a0284c3d38eed4143809b9ad39d798c Author: Tor Lillqvist <t...@iki.fi> Date: Mon Apr 16 23:30:22 2012 +0300 prefix the component_getFactory name for DISABLE_DYNLOADING diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 1296ccd..5adcba7 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -478,6 +478,10 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) return g_moduleCount.canUnload( &g_moduleCount , pTime ); } +#ifdef DISABLE_DYNLOADING +#define component_getFactory reflection_component_getFactory +#endif + //================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index fe98707..207088d 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -2906,6 +2906,10 @@ Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Referen } +#ifdef DISABLE_DYNLOADING +#define component_getFactory introspection_component_getFactory +#endif + extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits