[Libreoffice-commits] core.git: desktop/source dtrans/source extensions/source scripting/source

[Stephan Bergmann]

 desktop/source/deployment/gui/dp_gui_service.cxx   |    6 +++---
 dtrans/source/cnttype/mctfentry.cxx                |    2 +-
 extensions/source/bibliography/bibload.cxx         |    4 ++--
 scripting/source/dlgprov/dlgprov.cxx               |    4 ++--
 scripting/source/stringresource/stringresource.cxx |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 70946992d4d1b9d08fbb5cace885c8e93eebc137
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Aug 28 16:11:33 2014 +0200

    Fix some *_component_getFactory function types
    
    Change-Id: I912f9d1454c049419e9ead6f0ff8d7fa7d8cd6c5

diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index d42a05b..e4185bb 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 7ed64cb..279a1d3 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 90ba39f..feec3e9 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 bebd3ae..cc821c6 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 3bf5a43..7395254 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 );