Kaydet (Commit) 15f482b1 authored tarafından Matúš Kukan's avatar Matúš Kukan

Add prefixes for some component_getFactory functions

üst c902dc86
...@@ -60,7 +60,7 @@ namespace basic ...@@ -60,7 +60,7 @@ namespace basic
} // 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 ) const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey )
{ {
::basic::initializeModule(); ::basic::initializeModule();
......
...@@ -26,7 +26,7 @@ ...@@ -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"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.sfx2.DialogLibraryContainer"> <implementation name="com.sun.star.comp.sfx2.DialogLibraryContainer">
<service name="com.sun.star.script.DialogLibraryContainer"/> <service name="com.sun.star.script.DialogLibraryContainer"/>
......
...@@ -26,7 +26,7 @@ ...@@ -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"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.lingu2.ConvDicList"> <implementation name="com.sun.star.lingu2.ConvDicList">
<service name="com.sun.star.linguistic2.ConversionDictionaryList"/> <service name="com.sun.star.linguistic2.ConversionDictionaryList"/>
......
...@@ -78,7 +78,7 @@ extern void * SAL_CALL GrammarCheckingIterator_getFactory ...@@ -78,7 +78,7 @@ extern void * SAL_CALL GrammarCheckingIterator_getFactory
extern "C" 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 ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
void * pRet = void * pRet =
......
...@@ -44,7 +44,7 @@ using namespace com::sun::star::registry; ...@@ -44,7 +44,7 @@ using namespace com::sun::star::registry;
using ::rtl::OUString; 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 * pServiceManager,
void *) void *)
{ {
......
...@@ -26,7 +26,7 @@ ...@@ -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"> xmlns="http://openoffice.org/2010/uno-components">
<implementation <implementation
name="com.sun.star.comp.uui.PasswordContainerInteractionHandler"> name="com.sun.star.comp.uui.PasswordContainerInteractionHandler">
......
...@@ -106,7 +106,7 @@ namespace xmlscript ...@@ -106,7 +106,7 @@ namespace xmlscript
extern "C" 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 ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
return ::cppu::component_getFactoryHelper( return ::cppu::component_getFactoryHelper(
......
...@@ -26,7 +26,7 @@ ...@@ -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"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.xml.input.SaxDocumentHandler"> <implementation name="com.sun.star.comp.xml.input.SaxDocumentHandler">
<service name="com.sun.star.xml.input.SaxDocumentHandler"/> <service name="com.sun.star.xml.input.SaxDocumentHandler"/>
......
...@@ -42,7 +42,7 @@ using namespace ::com::sun::star; ...@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
extern "C" 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; void* pRet = 0;
uno::Reference< XInterface > xFactory; uno::Reference< XInterface > xFactory;
......
...@@ -53,7 +53,7 @@ using namespace ::com::sun::star::registry; ...@@ -53,7 +53,7 @@ using namespace ::com::sun::star::registry;
extern "C" 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*/ ) const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void * pRet = 0; void * pRet = 0;
......
...@@ -100,7 +100,7 @@ extern void* nss_component_getFactory( const sal_Char*, void*, void* ); ...@@ -100,7 +100,7 @@ extern void* nss_component_getFactory( const sal_Char*, void*, void* );
extern void* mscrypt_component_getFactory( const sal_Char*, void*, void* ); extern void* mscrypt_component_getFactory( const sal_Char*, void*, void* );
#endif #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; void* pRet = 0;
Reference< XInterface > xFactory ; Reference< XInterface > xFactory ;
......
...@@ -26,7 +26,7 @@ ...@@ -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"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.security.CertificateContainer"> <implementation name="com.sun.star.security.CertificateContainer">
<service name="com.sun.star.security.CertificateContainer"/> <service name="com.sun.star.security.CertificateContainer"/>
......
...@@ -26,7 +26,7 @@ ...@@ -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"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.xml.security.framework.DecryptorImpl"> <implementation name="com.sun.star.xml.security.framework.DecryptorImpl">
<service name="com.sun.star.xml.crypto.sax.Decryptor"/> <service name="com.sun.star.xml.crypto.sax.Decryptor"/>
......
...@@ -26,7 +26,7 @@ ...@@ -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"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.security.SerialNumberAdapter"> <implementation name="com.sun.star.security.SerialNumberAdapter">
<service name="com.sun.star.security.SerialNumberAdapter"/> <service name="com.sun.star.security.SerialNumberAdapter"/>
......
...@@ -26,7 +26,7 @@ ...@@ -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"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.security.SerialNumberAdapter"> <implementation name="com.sun.star.security.SerialNumberAdapter">
<service name="com.sun.star.security.SerialNumberAdapter"/> <service name="com.sun.star.security.SerialNumberAdapter"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment