Kaydet (Commit) 70946992 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix some *_component_getFactory function types

Change-Id: I912f9d1454c049419e9ead6f0ff8d7fa7d8cd6c5
üst b450d322
...@@ -331,11 +331,11 @@ extern "C" { ...@@ -331,11 +331,11 @@ extern "C" {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL deploymentgui_component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL deploymentgui_component_getFactory(
sal_Char const * pImplName, sal_Char const * pImplName,
lang::XMultiServiceFactory * pServiceManager, void * pServiceManager,
registry::XRegistryKey * pRegistryKey ) void * pRegistryKey )
{ {
return component_getFactoryHelper( return component_getFactoryHelper(
pImplName, pServiceManager, pRegistryKey, dp_gui::serviceDecl, dp_gui::licenseDecl, dp_gui::updateDecl ); pImplName, static_cast<css::lang::XMultiServiceFactory *>(pServiceManager), static_cast<css::registry::XRegistryKey *>(pRegistryKey), dp_gui::serviceDecl, dp_gui::licenseDecl, dp_gui::updateDecl );
} }
} // extern "C" } // extern "C"
......
...@@ -61,7 +61,7 @@ extern "C" ...@@ -61,7 +61,7 @@ extern "C"
// component_getFactory // component_getFactory
// returns a factory to create XFilePicker-Services // returns a factory to create XFilePicker-Services
SAL_DLLPUBLIC_EXPORT void* SAL_CALL mcnttype_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) SAL_DLLPUBLIC_EXPORT void* SAL_CALL mcnttype_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
{ {
void* pRet = 0; void* pRet = 0;
......
...@@ -193,7 +193,7 @@ Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static(void) t ...@@ -193,7 +193,7 @@ Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static(void) t
extern "C" extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL bib_component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL bib_component_getFactory(
const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ ) const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void * pRet = 0; void * pRet = 0;
if (BibliographyLoader::getImplementationName_Static().equalsAscii( pImplName ) ) if (BibliographyLoader::getImplementationName_Static().equalsAscii( pImplName ) )
...@@ -201,7 +201,7 @@ extern "C" ...@@ -201,7 +201,7 @@ extern "C"
// create the factory // create the factory
Reference< XSingleServiceFactory > xFactory = Reference< XSingleServiceFactory > xFactory =
cppu::createSingleFactory( cppu::createSingleFactory(
pServiceManager, static_cast<css::lang::XMultiServiceFactory *>(pServiceManager),
BibliographyLoader::getImplementationName_Static(), BibliographyLoader::getImplementationName_Static(),
BibliographyLoader_CreateInstance, BibliographyLoader_CreateInstance,
BibliographyLoader::getSupportedServiceNames_Static() ); BibliographyLoader::getSupportedServiceNames_Static() );
......
...@@ -818,8 +818,8 @@ static OUString aResourceResolverPropName("ResourceResolver"); ...@@ -818,8 +818,8 @@ static OUString aResourceResolverPropName("ResourceResolver");
extern "C" extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL dlgprov_component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL dlgprov_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, const sal_Char * pImplName, void * pServiceManager,
registry::XRegistryKey * pRegistryKey ) void * pRegistryKey )
{ {
return ::cppu::component_getFactoryHelper( return ::cppu::component_getFactoryHelper(
pImplName, pServiceManager, pRegistryKey, ::dlgprov::s_component_entries ); pImplName, pServiceManager, pRegistryKey, ::dlgprov::s_component_entries );
......
...@@ -2988,8 +2988,8 @@ static const struct ::cppu::ImplementationEntry s_component_entries [] = ...@@ -2988,8 +2988,8 @@ static const struct ::cppu::ImplementationEntry s_component_entries [] =
extern "C" extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL stringresource_component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL stringresource_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, const sal_Char * pImplName, void * pServiceManager,
registry::XRegistryKey * pRegistryKey ) void * pRegistryKey )
{ {
return ::cppu::component_getFactoryHelper( return ::cppu::component_getFactoryHelper(
pImplName, pServiceManager, pRegistryKey, ::stringresource::s_component_entries ); pImplName, pServiceManager, pRegistryKey, ::stringresource::s_component_entries );
......
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