diff options
-rw-r--r-- | basic/source/uno/sbservices.cxx | 2 | ||||
-rwxr-xr-x | basic/util/sb.component | 2 | ||||
-rwxr-xr-x | linguistic/source/lng.component | 2 | ||||
-rw-r--r-- | linguistic/source/lngreg.cxx | 2 | ||||
-rw-r--r-- | uui/source/services.cxx | 2 | ||||
-rwxr-xr-x | uui/util/uui.component | 2 | ||||
-rw-r--r-- | xmlscript/source/misc/unoservices.cxx | 2 | ||||
-rwxr-xr-x | xmlscript/util/xcr.component | 2 | ||||
-rw-r--r-- | xmlsecurity/source/component/registerservices.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/framework/xsec_framework.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/util/xmlsecurity.component | 2 | ||||
-rw-r--r-- | xmlsecurity/util/xsec_fw.component | 2 | ||||
-rw-r--r-- | xmlsecurity/util/xsec_xmlsec.component | 2 | ||||
-rw-r--r-- | xmlsecurity/util/xsec_xmlsec.windows.component | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx index f4453d424bfa..d0bbd06e8b45 100644 --- a/basic/source/uno/sbservices.cxx +++ b/basic/source/uno/sbservices.cxx @@ -60,7 +60,7 @@ namespace basic } // namespace basic //........................................................................ -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sb_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) { ::basic::initializeModule(); diff --git a/basic/util/sb.component b/basic/util/sb.component index 4687bd1e7d0b..7f23c113df3a 100755 --- a/basic/util/sb.component +++ b/basic/util/sb.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="sb" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.sfx2.DialogLibraryContainer"> <service name="com.sun.star.script.DialogLibraryContainer"/> diff --git a/linguistic/source/lng.component b/linguistic/source/lng.component index f4f3ca603a88..1b31003d7bda 100755 --- a/linguistic/source/lng.component +++ b/linguistic/source/lng.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="lng" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.lingu2.ConvDicList"> <service name="com.sun.star.linguistic2.ConversionDictionaryList"/> diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index 34048e555c51..997efef110a4 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.cxx @@ -78,7 +78,7 @@ extern void * SAL_CALL GrammarCheckingIterator_getFactory extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL lng_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = diff --git a/uui/source/services.cxx b/uui/source/services.cxx index 2ef31275e197..a25af9158c53 100644 --- a/uui/source/services.cxx +++ b/uui/source/services.cxx @@ -44,7 +44,7 @@ using namespace com::sun::star::registry; using ::rtl::OUString; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uui_component_getFactory(sal_Char const * pImplName, void * pServiceManager, void *) { diff --git a/uui/util/uui.component b/uui/util/uui.component index 0a15ad6eb8e5..c78d6af93fd1 100755 --- a/uui/util/uui.component +++ b/uui/util/uui.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="uui" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.uui.PasswordContainerInteractionHandler"> diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index d795ee65ab9e..d6f03b789c39 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -106,7 +106,7 @@ namespace xmlscript extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL xcr_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/xmlscript/util/xcr.component b/xmlscript/util/xcr.component index 5ffe7f862fd7..b85d5d7b63d4 100755 --- a/xmlscript/util/xcr.component +++ b/xmlscript/util/xcr.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="xcr" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.xml.input.SaxDocumentHandler"> <service name="com.sun.star.xml.input.SaxDocumentHandler"/> diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx index 69d06d11261e..b3bc997a5761 100644 --- a/xmlsecurity/source/component/registerservices.cxx +++ b/xmlsecurity/source/component/registerservices.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void* pRet = 0; uno::Reference< XInterface > xFactory; diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx index a57ce0d0df86..4c2be36c56f8 100644 --- a/xmlsecurity/source/framework/xsec_framework.cxx +++ b/xmlsecurity/source/framework/xsec_framework.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star::registry; extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index 502eac846888..d7d919920067 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -100,7 +100,7 @@ extern void* nss_component_getFactory( const sal_Char*, void*, void* ); extern void* mscrypt_component_getFactory( const sal_Char*, void*, void* ); #endif -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey ) { void* pRet = 0; Reference< XInterface > xFactory ; diff --git a/xmlsecurity/util/xmlsecurity.component b/xmlsecurity/util/xmlsecurity.component index b0759e937dab..335eeef69d66 100644 --- a/xmlsecurity/util/xmlsecurity.component +++ b/xmlsecurity/util/xmlsecurity.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlsecurity" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.security.CertificateContainer"> <service name="com.sun.star.security.CertificateContainer"/> diff --git a/xmlsecurity/util/xsec_fw.component b/xmlsecurity/util/xsec_fw.component index eb9e3962a963..27a48795f058 100644 --- a/xmlsecurity/util/xsec_fw.component +++ b/xmlsecurity/util/xsec_fw.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="xsec_fw" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.xml.security.framework.DecryptorImpl"> <service name="com.sun.star.xml.crypto.sax.Decryptor"/> diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component index df4c2a7b26ee..01d69bb61b5d 100644 --- a/xmlsecurity/util/xsec_xmlsec.component +++ b/xmlsecurity/util/xsec_xmlsec.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="xsec_xmlsec" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.security.SerialNumberAdapter"> <service name="com.sun.star.security.SerialNumberAdapter"/> diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component index 7b4ef87a9480..cb877c20c6f4 100644 --- a/xmlsecurity/util/xsec_xmlsec.windows.component +++ b/xmlsecurity/util/xsec_xmlsec.windows.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="xsec_xmlsec" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.security.SerialNumberAdapter"> <service name="com.sun.star.security.SerialNumberAdapter"/> |