Use prefix
Change-Id: Ica989983b36ff4df7f6d6ab529c3bc0efef984e1
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="abp"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="org.openoffice.comp.abp.OAddressBookSourcePilot">
|
||||
<service name="com.sun.star.ui.dialogs.AddressBookSourcePilot"/>
|
||||
|
@@ -53,7 +53,7 @@ extern "C" void SAL_CALL abp_initializeModule()
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL abp_component_getFactory(
|
||||
const sal_Char* pImplementationName,
|
||||
void* pServiceManager,
|
||||
void* /*pRegistryKey*/)
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="bib"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="com.sun.star.extensions.Bibliography">
|
||||
<service name="com.sun.star.frame.Bibliography"/>
|
||||
|
@@ -212,7 +212,7 @@ Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames_Static(vo
|
||||
|
||||
extern "C"
|
||||
{
|
||||
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
|
||||
SAL_DLLPUBLIC_EXPORT void * SAL_CALL bib_component_getFactory(
|
||||
const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ )
|
||||
{
|
||||
void * pRet = 0;
|
||||
|
@@ -54,7 +54,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
|
||||
} ;
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *aImplementationName,
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ldapbe2_component_getFactory(const sal_Char *aImplementationName,
|
||||
void *aServiceManager,
|
||||
void *aRegistryKey) {
|
||||
return cppu::component_getFactoryHelper(aImplementationName,
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="ldapbe2"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="com.sun.star.comp.configuration.backend.LdapUserProfileBe">
|
||||
<service name="com.sun.star.configuration.backend.LdapUserProfileBe"/>
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="dbp"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="org.openoffice.comp.dbp.OGridWizard">
|
||||
<service name="com.sun.star.sdb.GridControlAutoPilot"/>
|
||||
|
@@ -57,7 +57,7 @@ extern "C" void SAL_CALL dbp_initializeModule()
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory(
|
||||
const sal_Char* pImplementationName,
|
||||
void* pServiceManager,
|
||||
void* /*pRegistryKey*/)
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="log"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="com.sun.star.comp.extensions.ConsoleHandler">
|
||||
<service name="com.sun.star.logging.ConsoleHandler"/>
|
||||
|
@@ -54,7 +54,7 @@ namespace logging
|
||||
} // namespace logging
|
||||
//........................................................................
|
||||
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL log_component_getFactory(
|
||||
const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*,
|
||||
SAL_UNUSED_PARAMETER void* )
|
||||
{
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="oleautobridge"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="com.sun.star.comp.ole.OleClient">
|
||||
<service name="com.sun.star.bridge.OleObjectFactory"/>
|
||||
|
@@ -72,7 +72,7 @@ Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiS
|
||||
}
|
||||
} // end namespace
|
||||
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL oleautobridge_component_getFactory(
|
||||
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
|
||||
{
|
||||
void * pRet = 0;
|
||||
@@ -119,7 +119,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
|
||||
}
|
||||
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
|
||||
component_canUnload( TimeValue* libUnused)
|
||||
oleautobridge_component_canUnload( TimeValue* libUnused)
|
||||
{
|
||||
return globalModuleCount.canUnload( &globalModuleCount, libUnused);
|
||||
}
|
||||
|
@@ -55,7 +55,7 @@
|
||||
using namespace cppu;
|
||||
|
||||
extern "C" {
|
||||
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
|
||||
SAL_DLLPUBLIC_EXPORT void* SAL_CALL pl_component_getFactory(
|
||||
const sal_Char* pImplementationName,
|
||||
void* pXUnoSMgr,
|
||||
void* /*pXUnoKey*/
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="pl"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="com.sun.star.extensions.PluginManager">
|
||||
<service name="com.sun.star.plugin.PluginManager"/>
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="pcr"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="StringRepresentation">
|
||||
<service name="com.sun.star.inspection.StringRepresentation"/>
|
||||
|
@@ -89,7 +89,7 @@ extern "C" void SAL_CALL pcr_initializeModule()
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pcr_component_getFactory(
|
||||
const sal_Char* pImplementationName,
|
||||
void* pServiceManager,
|
||||
SAL_UNUSED_PARAMETER void* /*pRegistryKey*/)
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="res"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="com.sun.star.comp.resource.OpenOfficeResourceLoader">
|
||||
<service name="com.sun.star.resource.OfficeResourceLoader"/>
|
||||
|
@@ -49,7 +49,7 @@ const sdecl::ServiceDecl OpenOfficeResourceLoaderDecl(
|
||||
"com.sun.star.comp.resource.OpenOfficeResourceLoader",
|
||||
"com.sun.star.resource.OfficeResourceLoader");
|
||||
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL res_component_getFactory(
|
||||
sal_Char const* pImplName,
|
||||
::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
|
||||
::com::sun::star::registry::XRegistryKey* pRegistryKey )
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="scn"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="com.sun.star.scanner.ScannerManager">
|
||||
<service name="com.sun.star.scanner.ScannerManager"/>
|
||||
|
@@ -36,7 +36,7 @@
|
||||
using namespace com::sun::star::registry;
|
||||
|
||||
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL scn_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
|
||||
{
|
||||
REF( ::com::sun::star::lang::XSingleServiceFactory ) xFactory;
|
||||
void* pRet = 0;
|
||||
|
@@ -379,7 +379,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
|
||||
{
|
||||
return cppu::component_getFactoryHelper(
|
||||
pszImplementationName,
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="updchk"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="vnd.sun.UpdateCheck">
|
||||
<service name="com.sun.star.setup.UpdateCheck"/>
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="updatefeed"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="vnd.sun.UpdateInformationProvider">
|
||||
<service name="com.sun.star.deployment.UpdateInformationProvider"/>
|
||||
|
@@ -822,7 +822,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
|
||||
{
|
||||
return cppu::component_getFactoryHelper(
|
||||
pszImplementationName,
|
||||
|
@@ -1025,7 +1025,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
|
||||
{
|
||||
return cppu::component_getFactoryHelper(
|
||||
pszImplementationName,
|
||||
|
@@ -26,7 +26,7 @@
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary"
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="updchkui"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="vnd.sun.UpdateCheckUI">
|
||||
<service name="com.sun.star.setup.UpdateCheckUI"/>
|
||||
|
Reference in New Issue
Block a user