[Libreoffice-commits] core.git: forms/source

[Stephan Bergmann]

 forms/source/misc/services.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2d43261c602c31a9362b0b8b1ac6af431a6f0994
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Aug 25 12:52:50 2014 +0200

    Fix *_component_getFactory function type
    
    Change-Id: I10414cbc61b5540f1b9f39b19699673868e9c3eb

diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index d4839c1..189cf35 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -241,7 +241,7 @@ void SAL_CALL createRegistryInfo_FORMS()
 }
 
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pImplName, void* _pServiceManager, void* /*_pRegistryKey*/)
 {
     if (!_pServiceManager || !_pImplName)
         return NULL;
@@ -273,7 +273,8 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pI
 
             Reference<XSingleServiceFactory> xFactory(
                 ::cppu::createSingleFactory(
-                    _pServiceManager,
+                    static_cast<css::lang::XMultiServiceFactory*>(
+                        _pServiceManager),
                     *pClasses,
                     aCurrentCreateFunction,
                     *pServices