From eeaa2ecd1e1f6e0f468854b891de0caa28c470e6 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Wed, 10 Apr 2013 16:29:45 +0200 Subject: remove unused component_canUnload functions Change-Id: Id3f41e2a620c47bb848718d0fc994739be2d64fc --- stoc/source/bootstrap/services.cxx | 15 ++------------- stoc/source/corereflection/crefl.cxx | 20 +------------------- stoc/source/invocation/invocation.cxx | 13 +------------ stoc/source/invocation_adapterfactory/iafactory.cxx | 13 +------------ stoc/source/javavm/javavm.cxx | 2 -- stoc/source/namingservice/namingservice.cxx | 11 +---------- stoc/source/proxy_factory/proxyfac.cxx | 12 +----------- stoc/source/security/permissions.h | 3 --- stoc/source/simpleregistry/simpleregistry.cxx | 7 ++----- stoc/source/stocservices/stocservices.cxx | 16 +--------------- stoc/source/tdmanager/tdmgr_common.hxx | 3 --- stoc/source/tdmanager/tdmgr_tdenumeration.cxx | 4 ---- 12 files changed, 10 insertions(+), 109 deletions(-) (limited to 'stoc') diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx index 72404f19f9bb..c66aeea7f61c 100644 --- a/stoc/source/bootstrap/services.cxx +++ b/stoc/source/bootstrap/services.cxx @@ -106,23 +106,12 @@ static struct ImplementationEntry g_entries[] = { 0, 0, 0, 0, 0, 0 } }; -extern "C" -{ - -#ifndef DISABLE_DYNLOADING -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) -{ - return g_moduleCount.canUnload( &g_moduleCount , pTime ); -} -#endif +#define component_getFactory bootstrap_component_getFactory -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL bootstrap_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index edec3880ec2e..23867573e567 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -451,10 +451,6 @@ Reference< XInterface > SAL_CALL IdlReflectionServiceImpl_create( } -//################################################################################################## -//################################################################################################## -//################################################################################################## - using namespace stoc_corefl; static struct ImplementationEntry g_entries[] = @@ -467,24 +463,10 @@ static struct ImplementationEntry g_entries[] = { 0, 0, 0, 0, 0, 0 } }; -extern "C" -{ - -#ifndef DISABLE_DYNLOADING - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) -{ - return g_moduleCount.canUnload( &g_moduleCount , pTime ); -} - -#endif - -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL reflection_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL reflection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index dd34050b501c..429b361715c7 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -1197,21 +1197,10 @@ static struct ImplementationEntry g_entries[] = { 0, 0, 0, 0, 0, 0 } }; -extern "C" -{ -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) -{ - return g_moduleCount.canUnload( &g_moduleCount , pTime ); -} - -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL invocation_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL invocation_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); } -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 92b04fba70ec..b1b5904f8bc2 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -954,22 +954,11 @@ static struct ::cppu::ImplementationEntry g_entries[] = { 0, 0, 0, 0, 0, 0 } }; -extern "C" -{ -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( - TimeValue *pTime ) -{ - return ::stoc_invadp::g_moduleCount.canUnload( - &::stoc_invadp::g_moduleCount, pTime ); -} - -//============================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL invocadapt_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL invocadapt_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 584a8ae8dc6e..78e67e9de75d 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -577,8 +577,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL javavm_component_getFactory(sal_ aServiceImplementation); } -// There is no component_canUnload, as the library cannot be unloaded. - JavaVirtualMachine::JavaVirtualMachine( css::uno::Reference< css::uno::XComponentContext > const & rContext): JavaVirtualMachine_Impl(*static_cast< osl::Mutex * >(this)), diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index cfbab255fe85..3f666af96c52 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -194,19 +194,10 @@ static struct ImplementationEntry g_entries[] = { 0, 0, 0, 0, 0, 0 } }; -extern "C" -{ -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) -{ - return g_moduleCount.canUnload( &g_moduleCount , pTime ); -} - -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL namingservice_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL namingservice_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index a788aa196c6b..590e855b7f73 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -500,21 +500,11 @@ static ::cppu::ImplementationEntry g_entries [] = } -extern "C" -{ - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) -{ - return g_moduleCount.canUnload( &g_moduleCount, pTime ); -} - -SAL_DLLPUBLIC_EXPORT void * SAL_CALL proxyfac_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL proxyfac_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, g_entries ); } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h index 39532990a220..66598960cd03 100644 --- a/stoc/source/security/permissions.h +++ b/stoc/source/security/permissions.h @@ -19,7 +19,6 @@ #ifndef _STOC_SEC_PERMISSIONS_H_ #define _STOC_SEC_PERMISSIONS_H_ -#include #include #include #include @@ -28,8 +27,6 @@ #include #include -extern ::rtl_StandardModuleCount g_moduleCount; - namespace stoc_sec { //================================================================================================== diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index dbf7d13ad262..f59d5cf42f3b 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -45,15 +45,12 @@ #include "rtl/string.hxx" #include "rtl/textcvt.h" #include "rtl/textenc.h" -#include "rtl/unload.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "sal/types.h" #include "bootstrapservices.hxx" -extern rtl_StandardModuleCount g_moduleCount; - namespace { class SimpleRegistry: @@ -61,9 +58,9 @@ class SimpleRegistry: css::registry::XSimpleRegistry, css::lang::XServiceInfo > { public: - SimpleRegistry() { g_moduleCount.modCnt.acquire(&g_moduleCount.modCnt); } + SimpleRegistry() {} - ~SimpleRegistry() { g_moduleCount.modCnt.release(&g_moduleCount.modCnt); } + ~SimpleRegistry() {} osl::Mutex mutex_; diff --git a/stoc/source/stocservices/stocservices.cxx b/stoc/source/stocservices/stocservices.cxx index 0ec496e9feb4..81810a937783 100644 --- a/stoc/source/stocservices/stocservices.cxx +++ b/stoc/source/stocservices/stocservices.cxx @@ -87,24 +87,10 @@ static struct ImplementationEntry g_entries[] = { 0, 0, 0, 0, 0, 0 } }; -extern "C" -{ - -#ifndef DISABLE_DYNLOADING - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) -{ - return g_moduleCount.canUnload( &g_moduleCount , pTime ); -} - -#endif - -SAL_DLLPUBLIC_EXPORT void * SAL_CALL stocservices_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL stocservices_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/tdmanager/tdmgr_common.hxx b/stoc/source/tdmanager/tdmgr_common.hxx index e841f5de5a3a..eb3bcdec850f 100644 --- a/stoc/source/tdmanager/tdmgr_common.hxx +++ b/stoc/source/tdmanager/tdmgr_common.hxx @@ -20,8 +20,6 @@ #ifndef _STOC_TDMGR_COMMON_HXX #define _STOC_TDMGR_COMMON_HXX -#include - #include "com/sun/star/reflection/XTypeDescription.hpp" #define ARLEN(x) (sizeof (x) / sizeof *(x)) @@ -29,7 +27,6 @@ namespace stoc_tdmgr { - extern rtl_StandardModuleCount g_moduleCount; struct IncompatibleTypeException { diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx index 0cacac0b86e8..ac71a1a0aa47 100644 --- a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx +++ b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx @@ -23,8 +23,6 @@ using namespace com::sun::star; -extern rtl_StandardModuleCount g_moduleCount; - namespace stoc_tdmgr { @@ -47,14 +45,12 @@ TypeDescriptionEnumerationImpl::TypeDescriptionEnumerationImpl( m_eDepth( eDepth ), m_aChildren( rTDEAS ) { - ::g_moduleCount.modCnt.acquire( &::g_moduleCount.modCnt ); } //========================================================================= // virtual TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl() { - ::g_moduleCount.modCnt.release( &::g_moduleCount.modCnt ); } //========================================================================= -- cgit