diff options
| -rw-r--r-- | Library_merged.mk | 2 | ||||
| -rw-r--r-- | android/qa/desktop/Makefile | 3 | ||||
| -rw-r--r-- | android/qa/sc/Makefile | 3 | ||||
| -rwxr-xr-x | configmgr/source/configmgr.component | 2 | ||||
| -rw-r--r-- | configmgr/source/services.cxx | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 | ||||
| -rw-r--r-- | ucb/source/core/ucb1.component | 2 | ||||
| -rw-r--r-- | ucb/source/core/ucbserv.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/file/prov.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/file/ucpfile1.component | 2 |
10 files changed, 11 insertions, 13 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index b994231ed36b..72be0719ecd6 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ ucbhelper \ utl \ vcl \ - xcr \ + xmlreader \ $(gb_STDLIBS) \ )) diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index c0fbe00c8dd7..14f53683eb1a 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -111,7 +111,6 @@ copy-stuff: buildrcs bootstrap.uno \ canvastoolslo \ comphelpgcc3 \ - configmgr.uno \ cppcanvaslo \ drawinglayerlo \ expwrap.uno \ @@ -152,9 +151,7 @@ copy-stuff: buildrcs svllo \ test \ tllo \ - ucb1 \ ucbhelper4gcc3 \ - ucpfile1 \ uno_cppu \ uno_cppuhelpergcc3 \ uno_sal \ diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 71d145b30401..81b8251889ce 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -58,7 +58,6 @@ copy-stuff: basegfxlo \ bootstrap.uno \ comphelpgcc3 \ - configmgr.uno \ datelo \ expwrap.uno \ fastsax.uno \ @@ -98,9 +97,7 @@ copy-stuff: textinstream.uno \ test \ tllo \ - ucb1 \ ucbhelper4gcc3 \ - ucpfile1 \ uno_cppu \ uno_cppuhelpergcc3 \ uno_sal \ diff --git a/configmgr/source/configmgr.component b/configmgr/source/configmgr.component index 9ad4c79eed0b..4cc8f1b2cf2e 100755 --- a/configmgr/source/configmgr.component +++ b/configmgr/source/configmgr.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="configmgr" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.ConfigurationProvider"> <service name="com.sun.star.configuration.ConfigurationProvider"/> diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx index 656f9d418d9b..72d610141733 100644 --- a/configmgr/source/services.cxx +++ b/configmgr/source/services.cxx @@ -87,7 +87,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL configmgr_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index a7dfc2209b7e..3bcab1a7debc 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -31,6 +31,7 @@ ifeq ($(MERGELIBS),TRUE) gb_MERGEDLIBS := \ avmedia \ canvastools \ + configmgr \ cppcanvas \ deploymentmisc \ drawinglayer \ @@ -51,7 +52,10 @@ gb_MERGEDLIBS := \ svx \ svxcore \ tk \ + ucb1 \ + ucpfile1 \ uui \ + xcr \ xo \ endif diff --git a/ucb/source/core/ucb1.component b/ucb/source/core/ucb1.component index e9d408822cc9..7dff3113cbbe 100644 --- a/ucb/source/core/ucb1.component +++ b/ucb/source/core/ucb1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucb" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ucb.CommandEnvironment"> <service name="com.sun.star.ucb.CommandEnvironment"/> diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index 33a689273557..1eb6ddbec6dc 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -40,7 +40,7 @@ using ::rtl::OUString; //========================================================================= -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucb_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index c71191aae11e..bd9889e8063e 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -49,7 +49,7 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::container; //========================================================================= -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/ucp/file/ucpfile1.component b/ucb/source/ucp/file/ucpfile1.component index 28032451220a..7cfe70c8e7c0 100644 --- a/ucb/source/ucp/file/ucpfile1.component +++ b/ucb/source/ucp/file/ucpfile1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpfile" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ucb.FileProvider"> <service name="com.sun.star.ucb.FileContentProvider"/> |