sw/source/ui/vba/service.cxx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
New commits: commit 6006747f0e728b162c433185c46e6bf74a26b395 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Aug 21 17:22:20 2014 +0200 Fix *_component_getFactory function type Change-Id: I0f2fedc544349a69f29df5e83bec30ea510125f5 diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index 8b3dc9e..d7e84d67 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -23,9 +23,6 @@ // component exports -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; - namespace sdecl = comphelper::service_decl; namespace globals @@ -54,11 +51,13 @@ extern sdecl::ServiceDecl const serviceDecl; } extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaswobj_component_getFactory( - const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) + const sal_Char * pImplName, void * pServiceManager, + void * pRegistryKey ) { - void* pRet = component_getFactoryHelper(pImplName, pServiceManager, - pRegistryKey, globals::serviceDecl, ::document::serviceDecl, + void* pRet = component_getFactoryHelper(pImplName, + static_cast<css::lang::XMultiServiceFactory *>(pServiceManager), + static_cast<css::registry::XRegistryKey *>(pRegistryKey), + globals::serviceDecl, ::document::serviceDecl, wrapformat::serviceDecl, vbaeventshelper::serviceDecl ); OSL_TRACE("Ret is 0x%p", pRet); return pRet; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits