diff options
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_service.cxx | 6 | ||||
| -rw-r--r-- | dtrans/source/cnttype/mctfentry.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/bibliography/bibload.cxx | 4 | ||||
| -rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 4 | ||||
| -rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index d42a05b1baa5..e4185bbe7fdf 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -331,11 +331,11 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL deploymentgui_component_getFactory( sal_Char const * pImplName, - lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) + void * pServiceManager, + void * pRegistryKey ) { 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" diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx index 7ed64cb3cd2e..279a1d3668e0 100644 --- a/dtrans/source/cnttype/mctfentry.cxx +++ b/dtrans/source/cnttype/mctfentry.cxx @@ -61,7 +61,7 @@ extern "C" // component_getFactory // 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; diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 90ba39fe7a09..feec3e9ede85 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -193,7 +193,7 @@ Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static(void) t extern "C" { 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; if (BibliographyLoader::getImplementationName_Static().equalsAscii( pImplName ) ) @@ -201,7 +201,7 @@ extern "C" // create the factory Reference< XSingleServiceFactory > xFactory = cppu::createSingleFactory( - pServiceManager, + static_cast<css::lang::XMultiServiceFactory *>(pServiceManager), BibliographyLoader::getImplementationName_Static(), BibliographyLoader_CreateInstance, BibliographyLoader::getSupportedServiceNames_Static() ); diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index bebd3ae0ba39..cc821c675e47 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -818,8 +818,8 @@ static OUString aResourceResolverPropName("ResourceResolver"); extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL dlgprov_component_getFactory( - const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) + const sal_Char * pImplName, void * pServiceManager, + void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, ::dlgprov::s_component_entries ); diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 3bf5a434b1ee..739525449924 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -2988,8 +2988,8 @@ static const struct ::cppu::ImplementationEntry s_component_entries [] = extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL stringresource_component_getFactory( - const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) + const sal_Char * pImplName, void * pServiceManager, + void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, ::stringresource::s_component_entries ); |