Library_merged.mk | 3 + UnoControls/source/base/registercontrols.cxx | 2 - UnoControls/util/ctl.component | 2 - android/experimental/DocumentLoader/Makefile | 6 --- android/experimental/LibreOffice4Android/Makefile | 8 ---- embeddedobj/source/commonembedding/register.cxx | 2 - embeddedobj/util/embobj.component | 2 - eventattacher/source/eventattacher.cxx | 2 - eventattacher/source/evtatt.component | 2 - filter/inc/makefile.mk | 39 ---------------------- filter/source/svg/exports.map | 8 ---- hwpfilter/source/hwp.component | 2 - hwpfilter/source/hwpreader.hxx | 2 - scaddins/source/datefunc/datefunc.cxx | 9 +---- solenv/gbuild/extensions/pre_MergedLibsList.mk | 7 +++ stoc/source/corereflection/crefl.cxx | 6 --- stoc/source/corereflection/reflection.component | 2 - stoc/source/inspect/introspection.component | 2 - stoc/source/inspect/introspection.cxx | 6 --- ucb/source/cacher/cached1.component | 2 - ucb/source/cacher/cacheserv.cxx | 2 - ucb/source/sorter/sortmain.cxx | 2 - ucb/source/sorter/srtrs1.component | 2 - ucb/source/ucp/cmis/cmis_provider.cxx | 2 - ucb/source/ucp/cmis/ucpcmis1.component | 2 - ucb/source/ucp/expand/ucpexpand.cxx | 2 - ucb/source/ucp/expand/ucpexpand1.component | 2 - ucb/source/ucp/ext/ucpext.component | 2 - ucb/source/ucp/ext/ucpext_services.cxx | 2 - ucb/source/ucp/ftp/ftpservices.cxx | 2 - ucb/source/ucp/ftp/ucpftp1.component | 2 - ucb/source/ucp/gio/gio_provider.cxx | 2 - ucb/source/ucp/gio/ucpgio.component | 2 - ucb/source/ucp/gvfs/gvfs_provider.cxx | 2 - ucb/source/ucp/gvfs/ucpgvfs.component | 2 - ucb/source/ucp/hierarchy/hierarchyservices.cxx | 2 - ucb/source/ucp/hierarchy/ucphier1.component | 2 - ucb/source/ucp/odma/odma_services.cxx | 2 - ucb/source/ucp/odma/ucpodma1.component | 2 - ucb/source/ucp/package/pkgservices.cxx | 2 - ucb/source/ucp/package/ucppkg1.component | 2 - ucb/source/ucp/tdoc/tdoc_services.cxx | 2 - ucb/source/ucp/tdoc/ucptdoc1.component | 2 - ucb/source/ucp/webdav/ucpdav1.component | 2 - ucb/source/ucp/webdav/webdavservices.cxx | 2 - unotools/source/config/xmlaccelcfg.cxx | 4 +- 46 files changed, 51 insertions(+), 117 deletions(-)
New commits: commit dc8f9877d115f126c3bb211a0747a17f27a7f42c Author: Matúš Kukan <[email protected]> Date: Sat Sep 1 14:55:33 2012 +0200 libmerged: another small component libraries for android Change-Id: Icd36fe58cfe8dbcc737681e6fb477e64310bfaad diff --git a/Library_merged.mk b/Library_merged.mk index 2a53b60..9bc7214 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -58,8 +58,10 @@ $(eval $(call gb_Library_use_externals,merged,\ ifeq ($(OS),ANDROID) $(eval $(call gb_Library_use_externals,merged,\ hunspell \ + expat_utf8 \ )) $(eval $(call gb_Library_use_static_libraries,merged,\ + sax_shared \ ulingu \ )) $(eval $(call gb_Library_add_libs,merged,\ @@ -153,7 +155,6 @@ $(eval $(call gb_Library_add_libs,merged,\ $(eval $(call gb_Library_use_externals,merged,\ fontconfig \ freetype \ - expat_utf8 \ )) endif diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 1253992..ef736fe 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -51,20 +51,14 @@ copy-stuff: # them. # for F in $(strip \ - analysislo \ basegfxlo \ bootstrap.uno \ comphelpgcc3 \ - ctllo \ - datelo \ dbaxmllo \ dbtoolslo \ - evtattlo \ expwrap.uno \ - fastsax.uno \ frmlo \ gcc3_uno \ - hwplo \ i18nisolang1gcc3 \ icudatalo \ icui18nlo \ diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index fd45641..6296b13 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -20,24 +20,16 @@ copy-stuff: # them. # for F in $(strip \ - analysislo \ basegfxlo \ bootstrap.uno \ chartcontrollerlo \ chartcorelo \ comphelpgcc3 \ - cppcanvaslo \ - ctllo \ - datelo \ dbaxmllo \ dbtoolslo \ - embobj \ - evtattlo \ expwrap.uno \ - fastsax.uno \ frmlo \ gcc3_uno \ - hwplo \ i18nisolang1gcc3 \ icudatalo \ icui18nlo \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 5b2f6a8..745fd23 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -70,11 +70,18 @@ gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) ifeq ($(OS),ANDROID) gb_MERGEDLIBS += \ + analysis \ + ctl \ + date \ + embobj \ + evtatt \ + fastsax \ fileacc \ for \ forui \ fwl \ fwm \ + hwp \ hyphen \ lnth \ spell \ commit b4f030f0e3a702e6398698eff08e21141f2c761f Author: Matúš Kukan <[email protected]> Date: Sat Sep 1 21:04:10 2012 +0200 hide duplication into anonymous namespace Change-Id: Ie9a810f59d08d79636a0ad4b56adedb87479706e diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 010c7a5..698666f 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -523,13 +523,7 @@ uno::Sequence< sheet::LocalizedName > SAL_CALL ScaDateAddIn::getCompatibilityNam return aRet; } - -//------------------------------------------------------------------ -// -// function implementation starts here -// -//------------------------------------------------------------------ - +namespace { // auxiliary functions sal_Bool IsLeapYear( sal_uInt16 nYear ) @@ -660,6 +654,7 @@ sal_Int32 GetNullDate( const uno::Reference< beans::XPropertySet >& xOptions ) throw uno::RuntimeException(); } +} // XDateFunctions /** diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index ef4e400..57ea43e 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.cxx @@ -38,7 +38,7 @@ using ::rtl::OUString; #define ATTRIBUTE_TYPE_CDATA "CDATA" -// ------------------------------------------------------------------ +namespace { struct AttributeListImpl_impl; class AttributeListImpl : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList > @@ -185,7 +185,7 @@ void AttributeListImpl::clear() OSL_ASSERT( ! getLength() ); } -// ------------------------------------------------------------------ +} // anonymous namespace Any SAL_CALL OReadAccelatorDocumentHandler::queryInterface( const Type & rType ) throw( RuntimeException ) { commit d93fdcf391bdbab03933ceefa9a4457f4b635f44 Author: Matúš Kukan <[email protected]> Date: Sat Sep 1 14:46:53 2012 +0200 add more component prefixes Change-Id: I3afe59a6326b9e5cb26c39a82d7aabdb05cc2b7e diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx index 4d659f4..5738fec 100644 --- a/UnoControls/source/base/registercontrols.cxx +++ b/UnoControls/source/base/registercontrols.cxx @@ -98,7 +98,7 @@ CREATEINSTANCE ( StatusIndicator ) // create right component factory //______________________________________________________________________________________________________________ -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName , +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL ctl_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager , void* /*pRegistryKey*/ ) { diff --git a/UnoControls/util/ctl.component b/UnoControls/util/ctl.component index 481af32..19a903d 100644 --- a/UnoControls/util/ctl.component +++ b/UnoControls/util/ctl.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ctl" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="stardiv.UnoControls.FrameControl"> <service name="com.sun.star.frame.FrameControl"/> diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index ce7d28b..fe20fe0 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { diff --git a/embeddedobj/util/embobj.component b/embeddedobj/util/embobj.component index e46945d..f7a9c2e 100644 --- a/embeddedobj/util/embobj.component +++ b/embeddedobj/util/embobj.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="embobj" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.embed.EmbeddedObjectCreator"> <service name="com.sun.star.comp.embed.EmbeddedObjectCreator"/> diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 522940e..06764fe 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -905,7 +905,7 @@ Sequence< Reference<XEventListener> > EventAttacherImpl::attachMultipleEventList extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL evtatt_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/eventattacher/source/evtatt.component b/eventattacher/source/evtatt.component index a0eebb9..57b36bb 100644 --- a/eventattacher/source/evtatt.component +++ b/eventattacher/source/evtatt.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="evtatt" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.EventAttacher"> <service name="com.sun.star.script.EventAttacher"/> diff --git a/hwpfilter/source/hwp.component b/hwpfilter/source/hwp.component index 4b7b9ff..2f8be17 100644 --- a/hwpfilter/source/hwp.component +++ b/hwpfilter/source/hwp.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="hwp" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.comp.hwpimport.HwpImportFilter"> <service name="com.sun.star.document.ImportFilter"/> diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index e5cefc5..eb759d0 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -331,7 +331,7 @@ Sequence< OUString> HwpImportFilter::getSupportedServiceNames() throw(::com::sun extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) + SAL_DLLPUBLIC_EXPORT void * SAL_CALL hwp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index ffae957..1af1b3a 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -469,12 +469,8 @@ 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( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL reflection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/stoc/source/corereflection/reflection.component b/stoc/source/corereflection/reflection.component index 13d9cad..4835f31 100644 --- a/stoc/source/corereflection/reflection.component +++ b/stoc/source/corereflection/reflection.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="reflection" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.stoc.CoreReflection"> <service name="com.sun.star.reflection.CoreReflection"/> diff --git a/stoc/source/inspect/introspection.component b/stoc/source/inspect/introspection.component index 7173496..79f1668 100644 --- a/stoc/source/inspect/introspection.component +++ b/stoc/source/inspect/introspection.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="introspection" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.stoc.Introspection"> <service name="com.sun.star.beans.Introspection"/> diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 049d61c..cdb285d 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -2874,13 +2874,9 @@ 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( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL introspection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * ) { commit 009be0a85096ae3594c061922950fc045848f8c8 Author: Matúš Kukan <[email protected]> Date: Fri Aug 31 21:56:36 2012 +0200 filter: remove leftover files Change-Id: Ifc0525189fb68f8976cd25a5c83419c47281d025 diff --git a/filter/inc/makefile.mk b/filter/inc/makefile.mk deleted file mode 100644 index fe07083..0000000 --- a/filter/inc/makefile.mk +++ /dev/null @@ -1,39 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=filter -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/filter/source/svg/exports.map b/filter/source/svg/exports.map deleted file mode 100644 index e28b04c..0000000 --- a/filter/source/svg/exports.map +++ /dev/null @@ -1,8 +0,0 @@ -UDK_3_0_0 { - global: - component_getFactory; - GraphicImport; - - local: - *; -}; commit f1493c583fa02abcde685980b6f0d60b0338d772 Author: Matúš Kukan <[email protected]> Date: Fri Aug 31 21:45:56 2012 +0200 ucb: add component prefixes Change-Id: I77bb24d90d310452530abe57ebc183cce98043de diff --git a/ucb/source/cacher/cached1.component b/ucb/source/cacher/cached1.component index aa19e54..13cc576 100644 --- a/ucb/source/cacher/cached1.component +++ b/ucb/source/cacher/cached1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="cached1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.ucb.CachedContentResultSetFactory"> <service name="com.sun.star.ucb.CachedContentResultSetFactory"/> diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index 32d9615..dcd0c18 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star::registry; using ::rtl::OUString; //========================================================================= -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cached1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index 1a5957b..ed2d707 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -36,7 +36,7 @@ using ::rtl::OUString; //========================================================================= -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL srtrs1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/sorter/srtrs1.component b/ucb/source/sorter/srtrs1.component index c327051..4f59e54 100644 --- a/ucb/source/sorter/srtrs1.component +++ b/ucb/source/sorter/srtrs1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="srtrs1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.ucb.SortedDynamicResultSetFactory"> <service name="com.sun.star.ucb.SortedDynamicResultSetFactory"/> diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index 14a3b81..271cd5b 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -125,7 +125,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpcmis1_component_getFactory( const sal_Char *pImplName, void *pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/ucp/cmis/ucpcmis1.component b/ucb/source/ucp/cmis/ucpcmis1.component index 0d61780..96ce7c3 100644 --- a/ucb/source/ucp/cmis/ucpcmis1.component +++ b/ucb/source/ucp/cmis/ucpcmis1.component @@ -26,7 +26,7 @@ * instead of those above. **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpcmis1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.CmisContentProvider"> <service name="com.sun.star.ucb.CmisContentProvider"/> diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 0c74ba4..3f75376 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -266,7 +266,7 @@ static const ::cppu::ImplementationEntry s_entries [] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpexpand1_component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/ucb/source/ucp/expand/ucpexpand1.component b/ucb/source/ucp/expand/ucpexpand1.component index c8a7e8e..307522c 100644 --- a/ucb/source/ucp/expand/ucpexpand1.component +++ b/ucb/source/ucp/expand/ucpexpand1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpexpand1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.ucb.ExpandContentProvider"> <service name="com.sun.star.ucb.ExpandContentProvider"/> diff --git a/ucb/source/ucp/ext/ucpext.component b/ucb/source/ucp/ext/ucpext.component index 2982529..29266f4 100644 --- a/ucb/source/ucp/ext/ucpext.component +++ b/ucb/source/ucp/ext/ucpext.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpext" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="org.openoffice.comp.ucp.ext.ContentProvider"> <service name="com.sun.star.ucb.ExtensionContentProvider"/> diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx index b6e1068..41fef9f 100644 --- a/ucb/source/ucp/ext/ucpext_services.cxx +++ b/ucb/source/ucp/ext/ucpext_services.cxx @@ -70,7 +70,7 @@ namespace ucb { namespace ucp { namespace ext extern "C" { //------------------------------------------------------------------------------------------------------------------ - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpext_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries ); } diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx index afa27b7..0597551 100644 --- a/ucb/source/ucp/ftp/ftpservices.cxx +++ b/ucb/source/ucp/ftp/ftpservices.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star; using namespace ftp; //========================================================================= -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpftp1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/ftp/ucpftp1.component b/ucb/source/ucp/ftp/ucpftp1.component index fa4cfe6..c0137e9 100644 --- a/ucb/source/ucp/ftp/ucpftp1.component +++ b/ucb/source/ucp/ftp/ucpftp1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpftp1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.FTPContentProvider"> <service name="com.sun.star.ucb.FTPContentProvider"/> diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index e1c25cd..b645aa1 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -101,7 +101,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( const sal_Char *pImplName, void *pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/ucp/gio/ucpgio.component b/ucb/source/ucp/gio/ucpgio.component index caa8fc3..5993e70 100644 --- a/ucb/source/ucp/gio/ucpgio.component +++ b/ucb/source/ucp/gio/ucpgio.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpgio1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.GIOContentProvider"> <service name="com.sun.star.ucb.GIOContentProvider"/> diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index cb4f3ae..6b7ae7c 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -140,7 +140,7 @@ ContentProvider::queryContent( //============================ shlib entry points ============================================= -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgvfs1_component_getFactory( const sal_Char *pImplName, void *pServiceManager, void */*pRegistryKey*/ ) { diff --git a/ucb/source/ucp/gvfs/ucpgvfs.component b/ucb/source/ucp/gvfs/ucpgvfs.component index cec3e4d..abb2901 100644 --- a/ucb/source/ucp/gvfs/ucpgvfs.component +++ b/ucb/source/ucp/gvfs/ucpgvfs.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpgvfs1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.GnomeVFSContentProvider"> <service name="com.sun.star.ucb.GnomeVFSContentProvider"/> diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx index fb67389..d020c22 100644 --- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star; using namespace hierarchy_ucp; //========================================================================= -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucphier1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/hierarchy/ucphier1.component b/ucb/source/ucp/hierarchy/ucphier1.component index 5483187..4c93da0 100644 --- a/ucb/source/ucp/hierarchy/ucphier1.component +++ b/ucb/source/ucp/hierarchy/ucphier1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucphier1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.ucb.HierarchyContentProvider"> <service name="com.sun.star.ucb.HierarchyContentProvider"/> diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx index ff9f136..93d7d1f 100644 --- a/ucb/source/ucp/odma/odma_services.cxx +++ b/ucb/source/ucp/odma/odma_services.cxx @@ -40,7 +40,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; //========================================================================= -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpodma1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/odma/ucpodma1.component b/ucb/source/ucp/odma/ucpodma1.component index fa1abae..709ebea 100644 --- a/ucb/source/ucp/odma/ucpodma1.component +++ b/ucb/source/ucp/odma/ucpodma1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpodma1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.ucb.FileProvider"> <service name="com.sun.star.ucb.ODMAContentProvider"/> diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index 8bc6f45..b1a2841 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star; //========================================================================= -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucppkg1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/package/ucppkg1.component b/ucb/source/ucp/package/ucppkg1.component index a2e2418..c842595 100644 --- a/ucb/source/ucp/package/ucppkg1.component +++ b/ucb/source/ucp/package/ucppkg1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucppkg1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.ucb.PackageContentProvider"> <service name="com.sun.star.ucb.PackageContentProvider"/> diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx index 78a790d..77f2c04 100644 --- a/ucb/source/ucp/tdoc/tdoc_services.cxx +++ b/ucb/source/ucp/tdoc/tdoc_services.cxx @@ -38,7 +38,7 @@ using namespace com::sun::star; using namespace tdoc_ucp; //========================================================================= -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucptdoc1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/tdoc/ucptdoc1.component b/ucb/source/ucp/tdoc/ucptdoc1.component index 8ba1471..bc67905 100644 --- a/ucb/source/ucp/tdoc/ucptdoc1.component +++ b/ucb/source/ucp/tdoc/ucptdoc1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucptdoc1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.ucb.TransientDocumentsContentProvider"> <service name="com.sun.star.ucb.TransientDocumentsContentProvider"/> diff --git a/ucb/source/ucp/webdav/ucpdav1.component b/ucb/source/ucp/webdav/ucpdav1.component index 4e18b56..5abdc1b 100644 --- a/ucb/source/ucp/webdav/ucpdav1.component +++ b/ucb/source/ucp/webdav/ucpdav1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpdav1" xmlns="http://openoffice.org/2010/uno-components";> <implementation name="com.sun.star.comp.WebDAVContentProvider"> <service name="com.sun.star.ucb.WebDAVContentProvider"/> diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx index 26f8692..c88eb6f 100644 --- a/ucb/source/ucp/webdav/webdavservices.cxx +++ b/ucb/source/ucp/webdav/webdavservices.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star; //========================================================================= -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0;
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
