cppuhelper/source/shlib.cxx | 18 +++++++++- ios/qa/sc/Makefile | 2 - sal/Module_sal.mk | 3 + solenv/gbuild/ComponentTarget.mk | 7 +++- solenv/gbuild/Library.mk | 5 ++ solenv/inc/settings.mk | 10 ++++- stoc/source/simpleregistry/textualservices.cxx | 2 + ucb/source/cacher/cachedcontentresultset.cxx | 6 ++- ucb/source/cacher/cachedcontentresultsetstub.cxx | 6 ++- ucb/source/cacher/cacheddynamicresultset.cxx | 6 ++- ucb/source/cacher/cacheddynamicresultsetstub.cxx | 6 ++- ucb/source/core/provprox.cxx | 6 ++- ucb/source/core/ucb.cxx | 6 ++- ucb/source/core/ucbprops.cxx | 6 ++- ucb/source/core/ucbstore.cxx | 6 ++- ucb/source/sorter/sortdynres.cxx | 6 ++- ucb/source/ucp/cmis/cmis_provider.cxx | 6 ++- ucb/source/ucp/ftp/ftpcontent.cxx | 9 ++--- ucb/source/ucp/ftp/ftpcontentprovider.cxx | 4 +- ucb/source/ucp/gio/gio_provider.cxx | 6 ++- ucb/source/ucp/gvfs/gvfs_provider.cxx | 6 ++- ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 6 ++- ucb/source/ucp/odma/odma_provider.cxx | 5 +- ucb/source/ucp/package/pkgprovider.cxx | 6 ++- ucb/source/ucp/tdoc/tdoc_provider.cxx | 6 ++- ucb/source/ucp/webdav/webdavprovider.cxx | 6 ++- ucbhelper/inc/ucbhelper/macros.hxx | 39 +++++------------------ ucbhelper/source/client/contentbroker.cxx | 34 ++++---------------- 28 files changed, 129 insertions(+), 105 deletions(-)
New commits: commit 0884201aa51b12e5f363d2e2c3f81da2426411ee Author: Tor Lillqvist <t...@iki.fi> Date: Thu Mar 29 08:20:17 2012 +0300 Only basename in component uris in DISABLE_DYNLOADING case here, too diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 31b0174..9988f7c 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1305,12 +1305,18 @@ XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar CPPUNIT_CFLAGS = .END +.IF "$(DISABLE_DYNLOADING)" == "TRUE" +COMPONENTPREFIX_URE_NATIVE = +COMPONENTPREFIX_BASIS_NATIVE = +COMPONENTPREFIX_INBUILD_NATIVE = +.ELSE COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/ -COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/ COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/ +COMPONENTPREFIX_INBUILD_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/ +.ENDIF +COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/ COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$LO_JAVA_DIR/ COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule: -COMPONENTPREFIX_INBUILD_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/ COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$LO_JAVA_DIR/ COMPONENTPREFIX_EXTENSION = ./ commit 6a14f51af652d36eed60f3b8a6b8fe995e3a7b6d Author: Tor Lillqvist <t...@iki.fi> Date: Thu Mar 29 07:58:09 2012 +0300 Follow-up to revert of "Initial experiments with static linking of (some) ..." Revert "this requires string literals now" and "fix after recent XSERVICEINFO_IMPL_1 change". This reverts commits f7d571d2eefea079be3d89f3253ed90cbd9fa07f and 186ab8e77bd7c7a42ffcca6fa7f8e1819ad04b7d. diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 14bdbd0..62e8d98 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -94,8 +94,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, com::sun::star::ucb::XContentProvider ); XSERVICEINFO_IMPL_1( ContentProvider, - "com.sun.star.comp.GIOContentProvider", - "com.sun.star.ucb.GIOContentProvider" ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.GIOContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.GIOContentProvider" )) ); ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index c34cbe7..7552a20 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -84,8 +84,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( ContentProvider, - "com.sun.star.comp.GnomeVFSContentProvider", - "com.sun.star.ucb.GnomeVFSContentProvider" ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.GnomeVFSContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.GnomeVFSContentProvider" )) ); //========================================================================= // // Service factory implementation. diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx index 702851f..da09d11 100644 --- a/ucb/source/ucp/odma/odma_provider.cxx +++ b/ucb/source/ucp/odma/odma_provider.cxx @@ -149,8 +149,9 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, // @@@ Adjust implementation name. Keep the prefix "com.sun.star.comp."! // @@@ Adjust service name. XSERVICEINFO_IMPL_1( ContentProvider, - "com.sun.star.comp.odma.ContentProvider", - ODMA_CONTENT_PROVIDER_SERVICE_NAME ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.odma.ContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODMA_CONTENT_PROVIDER_SERVICE_NAME) ) ); //========================================================================= // commit 1ea166153b0dafba9a7483748e0b7851c3b27fd9 Author: Tor Lillqvist <t...@iki.fi> Date: Thu Mar 29 07:28:23 2012 +0300 No CppunitTest_sal_osl_process for iOS either diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index ad64c85..e705122 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -54,7 +54,8 @@ $(eval $(call gb_Module_add_check_targets,sal,\ CppunitTest_sal_osl_old_test_file \ CppunitTest_sal_osl_security \ CppunitTest_sal_osl_thread \ - CppunitTest_sal_osl_process \ + $(if $(filter $(OS),IOS),, \ + CppunitTest_sal_osl_process) \ CppunitTest_sal_rtl_alloc \ CppunitTest_sal_rtl_cipher \ CppunitTest_sal_rtl_crc32 \ commit b5e4de326fb3422736c6ceb32e419ef95dbb57df Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 28 22:56:17 2012 +0300 Add some more temporary hardcoded library mappings for DISABLE_DYNLOADING diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 3c1445e..df898a6 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -467,6 +467,14 @@ extern "C" extern void * bootstrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + + // More of them, in order of discovery. This is a temporary way to handle this.. + extern void * ucb_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 * ucpfile_component_getFactory( + const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); } #endif @@ -525,11 +533,17 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( #ifdef DISABLE_DYNLOADING if ( rLibName.equals( OUSTR("bootstrap.uno" SAL_DLLEXTENSION)) ) - pSym = (oslGenericFunction) bootstrap_component_getFactory; + pSym = (oslGenericFunction) bootstrap_component_getFactory; + else if ( rLibName.equals( OUSTR("libucb1.a")) ) + pSym = (oslGenericFunction) ucb_component_getFactory; + else if ( rLibName.equals( OUSTR("configmgr.uno.a")) ) + pSym = (oslGenericFunction) configmgr_component_getFactory; + else if ( rLibName.equals( OUSTR("libucpfile1.a")) ) + pSym = (oslGenericFunction) ucpfile_component_getFactory; else { #if OSL_DEBUG_LEVEL > 1 - OSL_TRACE( "%s: attempting to load unknown library %s", __PRETTY_FUNCTION__, OUStringToOString( rLibName, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OSL_TRACE( "attempting to load unknown library %s", OUStringToOString( rLibName, RTL_TEXTENCODING_ASCII_US ).getStr() ); #endif } #else commit ded39ff8f6b17b4493f3a612a0f6f39181766414 Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 28 22:54:47 2012 +0300 We want just the library basename in the DISABLE_DYNLOADING case diff --git a/stoc/source/simpleregistry/textualservices.cxx b/stoc/source/simpleregistry/textualservices.cxx index 37540c8..ad24a44 100644 --- a/stoc/source/simpleregistry/textualservices.cxx +++ b/stoc/source/simpleregistry/textualservices.cxx @@ -326,6 +326,7 @@ void Parser::handleComponent() { ": <component> is missing \"loader\" attribute"))), css::uno::Reference< css::uno::XInterface >()); } +#ifndef DISABLE_DYNLOADING try { attrUri_ = rtl::Uri::convertRelToAbs(reader_.getUrl(), attrUri_); } catch (const rtl::MalformedUriException & e) { @@ -336,6 +337,7 @@ void Parser::handleComponent() { e.getMessage()), css::uno::Reference< css::uno::XInterface >()); } +#endif } void Parser::handleImplementation() { commit 0487871af64c83ecfc9d424f64357655b44aa923 Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 28 11:22:52 2012 +0300 Revert "Initial experiments with static linking of (some) ..." Thist idea caused too intrusive changes to the code of call sites, I think. Will do it another way that leaves call sites as is. This reverts commit 25d114eec4d451acdda1ddff4c8ed9d47ba6275f. diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 8c8654a..4c66b38 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -2200,8 +2200,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory, //-------------------------------------------------------------------------- XSERVICEINFO_IMPL_1( CachedContentResultSetFactory, - "com.sun.star.comp.ucb.CachedContentResultSetFactory", - CACHED_CONTENT_RESULTSET_FACTORY_NAME ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.CachedContentResultSetFactory" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + CACHED_CONTENT_RESULTSET_FACTORY_NAME )) ); //-------------------------------------------------------------------------- // Service factory implementation. diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 0ccca05..b32a8b6 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -531,8 +531,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory, //-------------------------------------------------------------------------- XSERVICEINFO_IMPL_1( CachedContentResultSetStubFactory, - "com.sun.star.comp.ucb.CachedContentResultSetStubFactory", - CACHED_CRS_STUB_FACTORY_NAME ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + CACHED_CRS_STUB_FACTORY_NAME )) ); //-------------------------------------------------------------------------- // Service factory implementation. diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index 7bc23a7..506c96f 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -176,8 +176,10 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory, //-------------------------------------------------------------------------- XSERVICEINFO_IMPL_1( CachedDynamicResultSetFactory, - "com.sun.star.comp.ucb.CachedDynamicResultSetFactory", - CACHED_DRS_FACTORY_NAME ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + CACHED_DRS_FACTORY_NAME )) ); //-------------------------------------------------------------------------- // Service factory implementation. diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index 4dc9469..4bc1840 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -166,8 +166,10 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory, //-------------------------------------------------------------------------- XSERVICEINFO_IMPL_1( CachedDynamicResultSetStubFactory, - "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory", - CACHED_DRS_STUB_FACTORY_NAME ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + CACHED_DRS_STUB_FACTORY_NAME )) ); //-------------------------------------------------------------------------- // Service factory implementation. diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 1ba4384..c73fe31 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -87,8 +87,10 @@ XTYPEPROVIDER_IMPL_3( UcbContentProviderProxyFactory, //========================================================================= XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory, - "com.sun.star.comp.ucb.UcbContentProviderProxyFactory", - PROVIDER_FACTORY_SERVICE_NAME ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + PROVIDER_FACTORY_SERVICE_NAME )) ); //========================================================================= // diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index e65322c..cbe7b2b 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -347,8 +347,10 @@ void SAL_CALL UniversalContentBroker::removeEventListener( //========================================================================= XSERVICEINFO_IMPL_1( UniversalContentBroker, - "com.sun.star.comp.ucb.UniversalContentBroker", - UCB_SERVICE_NAME ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.UniversalContentBroker" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + UCB_SERVICE_NAME )) ); //========================================================================= // diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index 0f41259..c778bf9 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -357,8 +357,10 @@ XTYPEPROVIDER_IMPL_3( UcbPropertiesManager, //========================================================================= XSERVICEINFO_IMPL_1( UcbPropertiesManager, - "com.sun.star.comp.ucb.UcbPropertiesManager", - PROPERTIES_MANAGER_SERVICE_NAME ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.UcbPropertiesManager" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + PROPERTIES_MANAGER_SERVICE_NAME )) ); //========================================================================= // diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 5b7e260..38b4980 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -244,8 +244,10 @@ XTYPEPROVIDER_IMPL_4( UcbStore, //========================================================================= XSERVICEINFO_IMPL_1( UcbStore, - "com.sun.star.comp.ucb.UcbStore", - STORE_SERVICE_NAME ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.UcbStore" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + STORE_SERVICE_NAME )) ); //========================================================================= // diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index 3620688..1b6c57d 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -511,8 +511,10 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSetFactory, //-------------------------------------------------------------------------- XSERVICEINFO_IMPL_1( SortedDynamicResultSetFactory, - "com.sun.star.comp.ucb.SortedDynamicResultSetFactory", - DYNAMIC_RESULTSET_FACTORY_NAME ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + DYNAMIC_RESULTSET_FACTORY_NAME )) ); //-------------------------------------------------------------------------- // Service factory implementation. diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index 0e68e04..f733cf0 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -94,8 +94,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, com::sun::star::ucb::XContentProvider ); XSERVICEINFO_IMPL_1( ContentProvider, - "com.sun.star.comp.CmisContentProvider", - "com.sun.star.ucb.CmisContentProvider" ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.CmisContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.CmisContentProvider" )) ); ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 67f118f..02da7ac 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -174,12 +174,11 @@ XTYPEPROVIDER_IMPL_6( FTPContent, #undef XSERVICEINFO_CREATE_INSTANCE_IMPL #define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) -#undef STATICALLY_LINKED_SERVICE -#define STATICALLY_LINKED_SERVICE( Class, ImplName, Service, Num ) - XSERVICEINFO_IMPL_1( FTPContent, - "com.sun.star.comp.FTPContent", - "com.sun.star.ucb.FTPContent" ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.FTPContent")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.FTPContent"))); diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index 5b50a41..4275279 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -103,8 +103,8 @@ XTYPEPROVIDER_IMPL_3(FTPContentProvider, XSERVICEINFO_IMPL_1( FTPContentProvider, - "com.sun.star.comp.FTPContentProvider", - FTP_CONTENT_PROVIDER_SERVICE_NAME); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.FTPContentProvider")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FTP_CONTENT_PROVIDER_SERVICE_NAME))); //========================================================================= // diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index f3a339e..c5bf7c5 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -100,8 +100,10 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( HierarchyContentProvider, - "com.sun.star.comp.ucb.HierarchyContentProvider", - HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.HierarchyContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME )) ); //========================================================================= // diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index d9b6efd..fbaa9fd 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -181,8 +181,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( ContentProvider, - "com.sun.star.comp.ucb.PackageContentProvider", - PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.PackageContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + PACKAGE_CONTENT_PROVIDER_SERVICE_NAME )) ); //========================================================================= // diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index fafea33..be5a4f1 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -105,8 +105,10 @@ XTYPEPROVIDER_IMPL_4( ContentProvider, XSERVICEINFO_IMPL_1( ContentProvider, - "com.sun.star.comp.ucb.TransientDocumentsContentProvider", - TDOC_CONTENT_PROVIDER_SERVICE_NAME ); + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + TDOC_CONTENT_PROVIDER_SERVICE_NAME ) ) ); //========================================================================= // diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 8dbca76..ba24d63 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -93,8 +93,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( ContentProvider, - "com.sun.star.comp.WebDAVContentProvider", - WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.WebDAVContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + WEBDAV_CONTENT_PROVIDER_SERVICE_NAME )) ); //========================================================================= // diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx index 445de8a..302be21 100644 --- a/ucbhelper/inc/ucbhelper/macros.hxx +++ b/ucbhelper/inc/ucbhelper/macros.hxx @@ -732,40 +732,19 @@ XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ com::sun::star::uno::Sequence< rtl::OUString > \ Class::getSupportedServiceNames_Static() -#ifdef DISABLE_DYNLOADING - -#define STATICALLY_LINKED_SERVICE( Class, ImplName, Service, Num ) \ -extern com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > service##Num( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rSMgr ) \ - __asm("SSF:" Service); \ +// 1 service name +#define XSERVICEINFO_IMPL_1( Class, ImplName, Service1 ) \ +XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ +XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ \ -com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > service##Num( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rSMgr ) \ +com::sun::star::uno::Sequence< rtl::OUString > \ +Class::getSupportedServiceNames_Static() \ { \ - com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory( Class::createServiceFactory( rSMgr ) ); \ - xFactory->acquire(); \ - return xFactory; \ + com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 ); \ + aSNS.getArray()[ 0 ] = Service1; \ + return aSNS; \ } -#else - -#define STATICALLY_LINKED_SERVICE( Class, ImplName, Service, Num ) // empty - -#endif - -// 1 service name -#define XSERVICEINFO_IMPL_1( Class, ImplName, Service1 ) \ -XSERVICEINFO_COMMOM_IMPL( Class, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ImplName )) ) \ -XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ - \ -com::sun::star::uno::Sequence< rtl::OUString > \ -Class::getSupportedServiceNames_Static() \ -{ \ - com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 ); \ - aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Service1 )); \ - return aSNS; \ -} \ - \ -STATICALLY_LINKED_SERVICE( Class, ImplName, Service1, 1 ) - #endif /* !_UCBHELPER_MACROS_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx index b38b421..d1eb179 100644 --- a/ucbhelper/source/client/contentbroker.cxx +++ b/ucbhelper/source/client/contentbroker.cxx @@ -34,7 +34,6 @@ *************************************************************************/ #include <osl/diagnose.h> #include <osl/mutex.hxx> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/ucb/XContentIdentifierFactory.hpp> @@ -49,30 +48,6 @@ #include <ucbhelper/configurationkeys.hxx> #endif -#ifdef DISABLE_DYNLOADING - -#define MSF_CREATEINSTANCE(Msf, Service) \ -({ \ - extern com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > service( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rSMgr ) __asm("SSF:" Service); \ - com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory( service( Msf ) ); \ - xFactory->createInstance(); \ -}) - -#define MSF_CREATEINSTANCE_WITHARGUMENTS(Msf, Service, Args) \ -({ \ - extern com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > service( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rSMgr ) __asm("SSF:" Service); \ - com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory( service( Msf ) ); \ - xFactory->createInstanceWithArguments( Args ); \ -}) - -#else - -#define MSF_CREATEINSTANCE(Msf, Service) Msf->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Service )) ) - -#define MSF_CREATEINSTANCE_WITHARGUMENTS(Msf, Service, Args) Msf->createInstanceWithArguments( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Service )), Args ) - -#endif - using namespace com::sun::star::lang; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; @@ -311,7 +286,9 @@ bool ContentBroker_Impl::initialize() { try { - xIfc = MSF_CREATEINSTANCE( m_xSMgr, "com.sun.star.ucb.UniversalContentBroker" ); + xIfc = m_xSMgr->createInstance( + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.UniversalContentBroker" )) ); } catch ( Exception const & ) { @@ -343,7 +320,10 @@ bool ContentBroker_Impl::initialize() { try { - xIfc = MSF_CREATEINSTANCE_WITHARGUMENTS( m_xSMgr, "com.sun.star.ucb.UniversalContentBroker", m_aArguments ); + xIfc = m_xSMgr->createInstanceWithArguments( + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.UniversalContentBroker" )), + m_aArguments ); } catch ( Exception const & ) { commit 29e0cf9fe6f2ec084d78bfd37f30875ba9d3068d Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 28 11:14:32 2012 +0300 More libs diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile index dacdf0c..f652079 100644 --- a/ios/qa/sc/Makefile +++ b/ios/qa/sc/Makefile @@ -30,7 +30,7 @@ SRCS = filters-test.m CFLAGS = $(SOLARINC) -LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a -Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/unoexceptionprotector.a $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc +LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a -Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/configmgr.uno.a -Wl,$(OUTDIR)/lib/unoexceptionprotector.a $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licuuc -ljpeg -ljvmfwk -llnglo -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 -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc all: $(APPDIR)/$(APP) stuff commit c53dccbaaeb069d51000dd444658e4c4335c5d89 Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 28 10:52:34 2012 +0300 No need for COMPONENTPREFIX when we link components statically diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index 71e733e..ee57d76 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -29,13 +29,18 @@ gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt gb_ComponentTarget_get_source = $(1)/$(2).component +# In the DISABLE_DYNLOADING case we don't need any COMPONENTPREFIX, we +# put just the static library filename into the uri parameter. For +# each statically linked app using some subset of LO components, there +# is a mapping from library filenames to direct pointers to the +# corresponding PREFIX_component_getFactory functions. define gb_ComponentTarget__command $(call gb_Output_announce,$(3),$(true),CMP,1) $(if $(LIBFILENAME),,$(call gb_Output_error,No LIBFILENAME set at component target: $(1))) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ $(gb_XSLTPROC) --nonet --stringparam uri \ - '$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \ + '$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(subst \d,$$,$(COMPONENTPREFIX)))$(LIBFILENAME)' -o $(1) \ $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2)) endef commit 3c5353256bb94ba99fea94939cf06ba723737c10 Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 28 10:39:42 2012 +0300 Add helpful comment diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 31c3e43..b7df1f4 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -127,6 +127,11 @@ gb_Library__get_layer_componentprefix = \ $(filter $(1):%,$(gb_Library__COMPONENTPREFIXES)), \ $(call gb_Output_error,no ComponentTarget native prefix for layer '$(1)'))) +# The \d gets turned into a dollar sign by a $(subst) call in +# gb_ComponentTarget__command in ComponentTarget.mk. As far as I +# understand, there is nothing magic to it, it is not some +# Make/awk/sed/whatever syntax. + gb_Library__COMPONENTPREFIXES := \ NONE:vnd.sun.star.expand:\dLO_LIB_DIR/ \ OOO:vnd.sun.star.expand:\dLO_LIB_DIR/ \ _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits