diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-19 16:50:50 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-19 16:52:03 +0200 |
commit | e8ff469da51904a2ddafd59b2dcf45539370e08e (patch) | |
tree | bf35796d9eca312ec3f06bbaa67abc70cdc42393 /extensions | |
parent | eeaa2ecd1e1f6e0f468854b891de0caa28c470e6 (diff) |
Remove any remaining remnants of unused component_canUnload feature
Change-Id: I635fd006b5ba9f5fb0091748ee2ff9bc3c1a2d2a
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/inc/componentmodule.hxx | 2 | ||||
-rw-r--r-- | extensions/source/ole/servreg.cxx | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index 68ae04c9d3d7..b34a84fcf87a 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.hxx @@ -50,7 +50,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService const OUString & _rComponentName, ::cppu::ComponentInstantiation _pCreateFunction, const ::com::sun::star::uno::Sequence< OUString > & _rServiceNames, - rtl_ModuleCount* _pModuleCounter + rtl_ModuleCount* ); //========================================================================= diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index e9ce4771af72..401b492725a8 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.cxx @@ -31,9 +31,6 @@ using namespace cppu; namespace ole_adapter { -rtl_StandardModuleCount globalModuleCount= MODULE_COUNT_INIT; - - Reference<XInterface> SAL_CALL ConverterProvider_CreateInstance2( const Reference<XMultiServiceFactory> & xSMgr) throw(Exception) @@ -76,29 +73,25 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL oleautobridge_component_getFacto { xFactory= createSingleFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager), OUString("com.sun.star.comp.ole.OleConverter2"), - ConverterProvider_CreateInstance2, seqServiceNames, - &globalModuleCount.modCnt ); + ConverterProvider_CreateInstance2, seqServiceNames ); } else if (pServiceManager && aImplName.equals( reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleConverterVar1") )) { xFactory= createSingleFactory( reinterpret_cast<XMultiServiceFactory*>(pServiceManager), OUString("com.sun.star.comp.ole.OleConverterVar1"), - ConverterProvider_CreateInstanceVar1, seqServiceNames, - &globalModuleCount.modCnt ); + ConverterProvider_CreateInstanceVar1, seqServiceNames ); } else if(pServiceManager && aImplName.equals(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleClient"))) { xFactory= createSingleFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager), OUString("com.sun.star.comp.ole.OleClient"), - OleClient_CreateInstance, seqServiceNames, - &globalModuleCount.modCnt); + OleClient_CreateInstance, seqServiceNames ); } else if(pServiceManager && aImplName.equals(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleServer"))) { xFactory= createOneInstanceFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager), OUString("com.sun.star.comp.ole.OleServer"), - OleServer_CreateInstance, seqServiceNames, - &globalModuleCount.modCnt); + OleServer_CreateInstance, seqServiceNames ); } if (xFactory.is()) |