diff options
| -rw-r--r-- | UnoControls/source/base/registercontrols.cxx | 2 | ||||
| -rw-r--r-- | UnoControls/util/ctl.component | 2 | ||||
| -rw-r--r-- | embeddedobj/source/commonembedding/register.cxx | 2 | ||||
| -rw-r--r-- | embeddedobj/util/embobj.component | 2 | ||||
| -rw-r--r-- | eventattacher/source/eventattacher.cxx | 2 | ||||
| -rw-r--r-- | eventattacher/source/evtatt.component | 2 | ||||
| -rw-r--r-- | hwpfilter/source/hwp.component | 2 | ||||
| -rw-r--r-- | hwpfilter/source/hwpreader.hxx | 2 | ||||
| -rw-r--r-- | stoc/source/corereflection/crefl.cxx | 6 | ||||
| -rw-r--r-- | stoc/source/corereflection/reflection.component | 2 | ||||
| -rw-r--r-- | stoc/source/inspect/introspection.component | 2 | ||||
| -rw-r--r-- | stoc/source/inspect/introspection.cxx | 6 |
12 files changed, 12 insertions, 20 deletions
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx index 4d659f465a38..5738fec896b9 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 481af3217a00..19a903dc9699 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 ce7d28be5bbb..fe20fe0e79e4 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 e46945dcb7e0..f7a9c2e7b3fb 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 522940eb30ae..06764fefb994 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 a0eebb97404c..57b36bbf10fd 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 4b7b9ff82e19..2f8be17a0264 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 e5cefc59f840..eb759d01713b 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 ffae95788345..1af1b3a629de 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 13d9cadc44f4..4835f31ea6a6 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 717349628d95..79f16686ea64 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 049d61cffb58..cdb285d6c9bb 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 * ) { |