diff options
49 files changed, 19 insertions, 393 deletions
diff --git a/animations/source/animcore/factreg.hxx b/animations/source/animcore/factreg.hxx index a809c068223f..c95ef38c904a 100644 --- a/animations/source/animcore/factreg.hxx +++ b/animations/source/animcore/factreg.hxx @@ -16,12 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/unload.h> namespace animcore { -extern rtl_StandardModuleCount g_moduleCount; - #define DECL_NODE_FACTORY(N)\ extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance_##N( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rSMgr ) throw (::com::sun::star::uno::Exception);\ extern OUString getImplementationName_##N();\ diff --git a/bridges/source/cpp_uno/shared/bridge.cxx b/bridges/source/cpp_uno/shared/bridge.cxx index cefb62ef3453..964899325611 100644 --- a/bridges/source/cpp_uno/shared/bridge.cxx +++ b/bridges/source/cpp_uno/shared/bridge.cxx @@ -20,8 +20,6 @@ #include "bridges/cpp_uno/shared/bridge.hxx" -#include "component.hxx" - #include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" #include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" @@ -188,9 +186,6 @@ Bridge::Bridge( , pUnoEnv( pUnoEnv_ ) , bExportCpp2Uno( bExportCpp2Uno_ ) { - bridges::cpp_uno::shared::g_moduleCount.modCnt.acquire( - &bridges::cpp_uno::shared::g_moduleCount.modCnt ); - aCpp2Uno.pBridge = this; aCpp2Uno.acquire = acquireMapping; aCpp2Uno.release = releaseMapping; @@ -209,8 +204,6 @@ Bridge::~Bridge() SAL_THROW(()) { (*((uno_Environment *)pUnoEnv)->release)( (uno_Environment *)pUnoEnv ); (*((uno_Environment *)pCppEnv)->release)( (uno_Environment *)pCppEnv ); - bridges::cpp_uno::shared::g_moduleCount.modCnt.release( - &bridges::cpp_uno::shared::g_moduleCount.modCnt ); } } } } diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index 89422eb50983..a7d2e22d133f 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include "component.hxx" - #include "bridges/cpp_uno/shared/bridge.hxx" #include "com/sun/star/uno/Reference.hxx" @@ -29,7 +26,6 @@ #include "osl/mutex.hxx" #include "osl/time.h" #include "rtl/process.h" -#include "rtl/unload.h" #include "rtl/ustrbuf.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" @@ -41,8 +37,6 @@ namespace bridges { namespace cpp_uno { namespace shared { -rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; - } } } namespace { @@ -183,19 +177,8 @@ static void SAL_CALL releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCpp static void SAL_CALL environmentDisposing( SAL_UNUSED_PARAMETER uno_Environment * ) SAL_THROW(()) { - bridges::cpp_uno::shared::g_moduleCount.modCnt.release( - &bridges::cpp_uno::shared::g_moduleCount.modCnt ); -} - -#ifndef DISABLE_DYNLOADING - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(TimeValue * pTime) SAL_THROW_EXTERN_C() { - return bridges::cpp_uno::shared::g_moduleCount.canUnload( - &bridges::cpp_uno::shared::g_moduleCount, pTime); } -#endif - #ifdef DISABLE_DYNLOADING #define uno_initEnvironment CPPU_ENV_uno_initEnvironment #endif @@ -209,8 +192,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv pCppEnv->pTypeName->buffer, rtl_str_getLength(CPPU_CURRENT_LANGUAGE_BINDING_NAME), CPPU_CURRENT_LANGUAGE_BINDING_NAME ) == 0, "### wrong environment type!" ); - bridges::cpp_uno::shared::g_moduleCount.modCnt.acquire( - &bridges::cpp_uno::shared::g_moduleCount.modCnt ); ((uno_ExtEnvironment *)pCppEnv)->computeObjectIdentifier = computeObjectIdentifier; ((uno_ExtEnvironment *)pCppEnv)->acquireInterface = acquireInterface; diff --git a/bridges/source/cpp_uno/shared/component.hxx b/bridges/source/cpp_uno/shared/component.hxx deleted file mode 100644 index c95a6f97b75d..000000000000 --- a/bridges/source/cpp_uno/shared/component.hxx +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_SHARED_COMPONENT_HXX -#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_SHARED_COMPONENT_HXX - -#include "rtl/unload.h" - -namespace bridges { namespace cpp_uno { namespace shared { - -extern rtl_StandardModuleCount g_moduleCount; - -} } } - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index a8bef0c0b8b7..8f77ad52393a 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -22,7 +22,6 @@ #include "jvmaccess/unovirtualmachine.hxx" #include "rtl/ref.hxx" -#include "rtl/unload.h" #include "rtl/strbuf.hxx" #include "uno/lbnames.h" @@ -195,8 +194,6 @@ void SAL_CALL Bridge_free( uno_Mapping * mapping ) } -rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; - } namespace jni_uno @@ -264,8 +261,6 @@ Bridge::Bridge( m_uno2java.release = Mapping_release; m_uno2java.mapInterface = Mapping_map_to_java; m_uno2java.m_bridge = this; - - (*g_moduleCount.modCnt.acquire)( &g_moduleCount.modCnt ); } //______________________________________________________________________________ @@ -273,8 +268,6 @@ Bridge::~Bridge() SAL_THROW(()) { (*m_java_env->release)( m_java_env ); (*((uno_Environment *)m_uno_env)->release)( (uno_Environment *)m_uno_env ); - - (*g_moduleCount.modCnt.release)( &g_moduleCount.modCnt ); } @@ -553,17 +546,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( } } -#ifndef DISABLE_DYNLOADING - -//------------------------------------------------------------------------------ -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) - SAL_THROW_EXTERN_C() -{ - return (*g_moduleCount.canUnload)( &g_moduleCount, pTime ); -} - -#endif - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 6195e2f4967a..7a28582efcd5 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -23,7 +23,6 @@ #include <windows.h> #include "uno/environment.hxx" #pragma warning(pop) -#include "rtl/unload.h" #include "uno/lbnames.h" #include "uno/mapping.hxx" #include "typelib/typedescription.hxx" @@ -335,14 +334,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( *ppMapping = mapping; } - -//################################################################################################## -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * ) - SAL_THROW_EXTERN_C() -{ - return true; -} - } } diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index d0afa62ca337..d5edfabdbaec 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -52,7 +52,6 @@ #include "osl/mutex.hxx" #include "sal/types.h" #include "rtl/ref.hxx" -#include "rtl/unload.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx index 5d11aa9c0aee..b9ab36999357 100644 --- a/configmgr/source/configurationprovider.hxx +++ b/configmgr/source/configurationprovider.hxx @@ -25,7 +25,6 @@ #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/Sequence.hxx" #include "cppuhelper/factory.hxx" -#include "rtl/unload.h" #include "sal/types.h" namespace com { namespace sun { namespace star { diff --git a/dtrans/source/win32/dnd/idroptarget.cxx b/dtrans/source/win32/dnd/idroptarget.cxx index 25ece152127d..b0e4ad970c55 100644 --- a/dtrans/source/win32/dnd/idroptarget.cxx +++ b/dtrans/source/win32/dnd/idroptarget.cxx @@ -18,7 +18,6 @@ */ #include "idroptarget.hxx" -#include <rtl/unload.h> #ifdef __MINGW32__ #if defined __uuidof @@ -27,17 +26,13 @@ #define __uuidof(I) IID_##I #endif -extern rtl_StandardModuleCount g_moduleCount; - IDropTargetImpl::IDropTargetImpl( DropTarget& pTarget): m_nRefCount( 0), m_rDropTarget( pTarget) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } IDropTargetImpl::~IDropTargetImpl() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx index 1c3e6fd88538..882c72b84416 100644 --- a/dtrans/source/win32/dnd/source.cxx +++ b/dtrans/source/win32/dnd/source.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/awt/MouseEvent.hpp> -#include <rtl/unload.h> #include <process.h> #include <memory> @@ -51,20 +50,10 @@ using namespace com::sun::star::awt::MouseButton; using namespace com::sun::star::awt; using namespace com::sun::star::lang; - -extern rtl_StandardModuleCount g_moduleCount; - -//--> TRA - extern Reference< XTransferable > g_XTransferable; -//<-- TRA - unsigned __stdcall DndOleSTAFunc(LPVOID pParams); -//---------------------------------------------------- -/** Ctor -*/ DragSource::DragSource( const Reference<XComponentContext>& rxContext): WeakComponentImplHelper3< XDragSource, XInitialization, XServiceInfo >(m_mutex), m_xContext( rxContext ), @@ -73,15 +62,10 @@ DragSource::DragSource( const Reference<XComponentContext>& rxContext): m_MouseButton(0), m_RunningDndOperationCount(0) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } -//---------------------------------------------------- -/** Dtor -*/ DragSource::~DragSource() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } //---------------------------------------------------- diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx index 413e9471e9e7..a9f1c090dac1 100644 --- a/dtrans/source/win32/dnd/sourcecontext.cxx +++ b/dtrans/source/win32/dnd/sourcecontext.cxx @@ -20,11 +20,9 @@ #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include "sourcecontext.hxx" -#include <rtl/unload.h> using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd::DNDConstants; -extern rtl_StandardModuleCount g_moduleCount; SourceContext::SourceContext( DragSource* pSource, const Reference<XDragSourceListener>& listener): @@ -32,7 +30,6 @@ SourceContext::SourceContext( DragSource* pSource, m_pDragSource( pSource), m_dragSource( static_cast<XDragSource*>( m_pDragSource) ) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); #if OSL_DEBUG_LEVEL > 1 if( listener.is()) #endif @@ -41,7 +38,6 @@ SourceContext::SourceContext( DragSource* pSource, SourceContext::~SourceContext() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } void SAL_CALL SourceContext::addDragSourceListener( diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx index 21c20a8a2e3b..e127b3d5e7fd 100644 --- a/dtrans/source/win32/dnd/target.cxx +++ b/dtrans/source/win32/dnd/target.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> -#include <rtl/unload.h> #include <stdio.h> #include "target.hxx" @@ -37,12 +36,8 @@ using namespace com::sun::star::datatransfer::dnd::DNDConstants; #define WM_REGISTERDRAGDROP WM_USER + 1 #define WM_REVOKEDRAGDROP WM_USER + 2 -//--> TRA extern Reference< XTransferable > g_XTransferable; -//<-- TRA - -extern rtl_StandardModuleCount g_moduleCount; DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams); DropTarget::DropTarget( const Reference<XComponentContext>& rxContext): @@ -59,17 +54,11 @@ DropTarget::DropTarget( const Reference<XComponentContext>& rxContext): m_nCurrentDropAction( ACTION_NONE), m_nLastDropAction(0), m_bDropComplete(false) - - { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } - DropTarget::~DropTarget() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); - } // called from WeakComponentImplHelperX::dispose // WeakComponentImplHelper calls disposing before it destroys diff --git a/dtrans/source/win32/dnd/targetdragcontext.cxx b/dtrans/source/win32/dnd/targetdragcontext.cxx index 284f0b1a373d..425f9d38707d 100644 --- a/dtrans/source/win32/dnd/targetdragcontext.cxx +++ b/dtrans/source/win32/dnd/targetdragcontext.cxx @@ -17,14 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/unload.h> - #include "targetdragcontext.hxx" -extern rtl_StandardModuleCount g_moduleCount; TargetDragContext::TargetDragContext( DropTarget* p) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); m_pDropTarget= p; p->acquire(); } @@ -32,7 +28,6 @@ TargetDragContext::TargetDragContext( DropTarget* p) TargetDragContext::~TargetDragContext() { m_pDropTarget->release(); - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } void SAL_CALL TargetDragContext::acceptDrag( sal_Int8 dragOperation ) diff --git a/dtrans/source/win32/dnd/targetdropcontext.cxx b/dtrans/source/win32/dnd/targetdropcontext.cxx index 63be68989d1f..93705a2dba9d 100644 --- a/dtrans/source/win32/dnd/targetdropcontext.cxx +++ b/dtrans/source/win32/dnd/targetdropcontext.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/unload.h> - #include "targetdropcontext.hxx" using namespace ::com::sun::star::datatransfer::dnd; @@ -26,10 +24,8 @@ using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -extern rtl_StandardModuleCount g_moduleCount; TargetDropContext::TargetDropContext( DropTarget* p) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); m_pDropTarget= p; p->acquire(); } @@ -37,7 +33,6 @@ TargetDropContext::TargetDropContext( DropTarget* p) TargetDropContext::~TargetDropContext() { m_pDropTarget->release(); - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } void SAL_CALL TargetDropContext::acceptDrop( sal_Int8 dropOperation ) diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index f540ef94a9a1..9e799071d857 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -33,8 +33,6 @@ #include "servprov.hxx" #include "unoobjw.hxx" #include "oleobjw.hxx" -#include <rtl/unload.h> - using namespace cppu; using namespace osl; @@ -53,8 +51,6 @@ namespace ole_adapter // {82154420-0FBF-11d4-8313-005004526AB4} DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0, 0x50, 0x4, 0x52, 0x6a, 0xb4); -extern rtl_StandardModuleCount globalModuleCount; - /***************************************************************************** class implementation ProviderOleWrapper_Impl @@ -332,8 +328,6 @@ OleConverter_Impl2::OleConverter_Impl2( const Reference<XMultiServiceFactory> &s UnoConversionUtilities<OleConverter_Impl2>( smgr) { - // library unloading support - globalModuleCount.modCnt.acquire( &globalModuleCount.modCnt); } // The XMultiServiceFactory is later set by XInitialization @@ -341,13 +335,10 @@ OleConverter_Impl2::OleConverter_Impl2( const Reference<XMultiServiceFactory>& UnoConversionUtilities<OleConverter_Impl2>( smgr, unoWrapperClass, comWrapperClass ) { - //library unloading support - globalModuleCount.modCnt.acquire( &globalModuleCount.modCnt); } OleConverter_Impl2::~OleConverter_Impl2() { - globalModuleCount.modCnt.release( &globalModuleCount.modCnt); } // XBridgeSupplier -------------------------------------------------------------- @@ -490,8 +481,6 @@ Reference< XInterface > OleConverter_Impl2::createComWrapperInstance() OleClient_Impl::OleClient_Impl( const Reference<XMultiServiceFactory>& smgr): UnoConversionUtilities<OleClient_Impl>( smgr) { - // library unloading support - globalModuleCount.modCnt.acquire( &globalModuleCount.modCnt); Reference<XInterface> xInt;// = m_smgr->createInstance(L"com.sun.star.bridge.OleBridgeSupplier2"); if (xInt.is()) @@ -504,8 +493,6 @@ OleClient_Impl::OleClient_Impl( const Reference<XMultiServiceFactory>& smgr): OleClient_Impl::~OleClient_Impl() { - // library unloading support - globalModuleCount.modCnt.release( &globalModuleCount.modCnt); } Sequence< OUString > SAL_CALL OleClient_Impl::getAvailableServiceNames() throw( RuntimeException ) @@ -610,8 +597,6 @@ Reference< XInterface > OleClient_Impl::createComWrapperInstance( ) OleServer_Impl::OleServer_Impl( const Reference<XMultiServiceFactory>& smgr): m_smgr( smgr) { - //library unloading support - globalModuleCount.modCnt.acquire( &globalModuleCount.modCnt); Reference<XInterface> xInt = m_smgr->createInstance(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.BridgeSupplier")); if (xInt.is()) @@ -633,8 +618,6 @@ OleServer_Impl::~OleServer_Impl() (*m_wrapperList.begin())->Release(); m_wrapperList.pop_front(); } - //library unloading support - globalModuleCount.modCnt.release( &globalModuleCount.modCnt); } // XInterface -------------------------------------------------- Any SAL_CALL OleServer_Impl::queryInterface( const Type& aType ) throw(RuntimeException) diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index a9bc8c3b4313..e9ce4771af72 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.cxx @@ -20,8 +20,6 @@ // http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010 #define _WIN32_WINNT 0x0403 - -#include <rtl/unload.h> #include <osl/time.h> #include "ole2uno.hxx" #include "servprov.hxx" @@ -112,10 +110,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL oleautobridge_component_getFacto return pRet; } -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -oleautobridge_component_canUnload( TimeValue* libUnused) -{ - return globalModuleCount.canUnload( &globalModuleCount, libUnused); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 148896bed322..7a1b72059de2 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -20,8 +20,6 @@ #include <string.h> #include <osl/diagnose.h> -#include <rtl/unload.h> - #include <uno/mapping.hxx> #include <cppuhelper/factory.hxx> @@ -484,20 +482,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 textinstream_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL textinstream_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/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 6716eb6d250f..36f332779188 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -28,7 +28,6 @@ #include <rtl/textenc.h> #include <rtl/tencinfo.h> -#include <rtl/unload.h> #include <com/sun/star/io/XTextOutputStream2.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -283,20 +282,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 textoutstream_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL textoutstream_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/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index b2bc9a842174..6c0a8cabadcc 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -70,8 +70,6 @@ namespace io_acceptor m_nStatus( 0 ), m_sDescription( sConnectionDescription ) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); - // make it unique m_sDescription += ",uniqueValue="; m_sDescription += OUString::valueOf( @@ -82,7 +80,6 @@ namespace io_acceptor PipeConnection::~PipeConnection() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } sal_Int32 PipeConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead ) diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index a5c7e20737e4..1eda5fc1234b 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -162,7 +162,6 @@ namespace io_acceptor { _closed(sal_False), _error(sal_False) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); // make it unique m_sDescription += ",uniqueValue=" ; m_sDescription += OUString::valueOf( @@ -173,7 +172,6 @@ namespace io_acceptor { SocketConnection::~SocketConnection() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } void SocketConnection::completeConnectionString() diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index a8bd18c7839e..ca66e6efea5c 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -326,22 +326,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 acceptor_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL acceptor_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/io/source/acceptor/acceptor.hxx b/io/source/acceptor/acceptor.hxx index 7bce85770cae..89002f0256b0 100644 --- a/io/source/acceptor/acceptor.hxx +++ b/io/source/acceptor/acceptor.hxx @@ -19,14 +19,11 @@ #include <osl/pipe.hxx> #include <osl/socket.hxx> -#include <rtl/unload.h> #include <com/sun/star/connection/XConnection.hpp> namespace io_acceptor { - extern rtl_StandardModuleCount g_moduleCount; - class PipeAcceptor { public: diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 38c2aee057bd..0d6571702bba 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -233,22 +233,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 connector_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL connector_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/io/source/connector/connector.hxx b/io/source/connector/connector.hxx index de4edef9960c..14abf3c6119f 100644 --- a/io/source/connector/connector.hxx +++ b/io/source/connector/connector.hxx @@ -16,7 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/unload.h> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> @@ -30,8 +29,6 @@ namespace stoc_connector { - extern rtl_StandardModuleCount g_moduleCount; - template<class T> struct ReferenceHash { diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx index ffb678668a8f..b4f5c7f9eb44 100644 --- a/io/source/connector/ctr_pipe.cxx +++ b/io/source/connector/ctr_pipe.cxx @@ -33,7 +33,6 @@ namespace stoc_connector { m_nStatus( 0 ), m_sDescription( sConnectionDescription ) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); // make it unique m_sDescription += ",uniqueValue="; m_sDescription += OUString::valueOf( @@ -44,7 +43,6 @@ namespace stoc_connector { PipeConnection::~PipeConnection() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } sal_Int32 PipeConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead ) diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx index 7c9a9d4ad4dc..745644790adf 100644 --- a/io/source/connector/ctr_socket.cxx +++ b/io/source/connector/ctr_socket.cxx @@ -85,7 +85,6 @@ namespace stoc_connector { _error(sal_False) { // make it unique - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); m_sDescription += ",uniqueValue="; m_sDescription += OUString::valueOf( sal::static_int_cast< sal_Int64 >( @@ -95,7 +94,6 @@ namespace stoc_connector { SocketConnection::~SocketConnection() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } void SocketConnection::completeConnectionString() diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx index ccd4eac14662..69f7e6d34837 100644 --- a/io/source/stm/factreg.cxx +++ b/io/source/stm/factreg.cxx @@ -85,21 +85,10 @@ static struct 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 streams_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL streams_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/io/source/stm/factreg.hxx b/io/source/stm/factreg.hxx index 158cd23ce794..c4548b2d78a7 100644 --- a/io/source/stm/factreg.hxx +++ b/io/source/stm/factreg.hxx @@ -16,12 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/unload.h> namespace io_stm { -extern rtl_StandardModuleCount g_moduleCount; - // OPipeImpl Reference< XInterface > SAL_CALL OPipeImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString OPipeImpl_getImplementationName(); diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 1636c1a8b844..18f07cbe1e9f 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -60,7 +60,6 @@ public: ODataInputStream( ) : m_bValidStream( sal_False ) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } ~ODataInputStream(); @@ -121,7 +120,6 @@ protected: ODataInputStream::~ODataInputStream() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } // XInputStream @@ -520,7 +518,6 @@ public: ODataOutputStream() : m_bValidStream( sal_False ) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } ~ODataOutputStream(); @@ -578,7 +575,6 @@ protected: ODataOutputStream::~ODataOutputStream() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } @@ -951,7 +947,6 @@ public: : m_nMaxId(0) , m_bValidMarkable(sal_False) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } ~OObjectOutputStream(); @@ -1024,7 +1019,6 @@ private: OObjectOutputStream::~OObjectOutputStream() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) @@ -1228,7 +1222,6 @@ public: , m_rCxt( r ) , m_bValidMarkable(sal_False) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } ~OObjectInputStream(); @@ -1311,7 +1304,6 @@ private: OObjectInputStream::~OObjectInputStream() { - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } Reference< XPersistObject > OObjectInputStream::readObject() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 8c1f6d37dbdb..156b70f95c5b 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -147,7 +147,6 @@ private: OMarkableOutputStream::OMarkableOutputStream( ) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); m_pBuffer = new MemRingBuffer; m_nCurrentPos = 0; m_nCurrentMark = 0; @@ -156,7 +155,6 @@ OMarkableOutputStream::OMarkableOutputStream( ) OMarkableOutputStream::~OMarkableOutputStream() { delete m_pBuffer; - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } @@ -573,7 +571,6 @@ private: OMarkableInputStream::OMarkableInputStream() { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); m_nCurrentPos = 0; m_nCurrentMark = 0; m_pBuffer = new MemRingBuffer; @@ -585,7 +582,6 @@ OMarkableInputStream::~OMarkableInputStream() if( m_pBuffer ) { delete m_pBuffer; } - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index 27c5ce002c01..36ad7049d95f 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -127,7 +127,6 @@ private: OPipeImpl::OPipeImpl() { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); m_nBytesToSkip = 0; m_bOutputStreamClosed = sal_False; @@ -141,7 +140,6 @@ OPipeImpl::~OPipeImpl() { osl_destroyCondition( m_conditionBytesAvail ); delete m_pFIFO; - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index e1ca00d93163..6224f9248645 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -108,7 +108,6 @@ Pump::Pump() : m_aThread( 0 ), m_cnt( m_aMutex ), m_closeFired( sal_False ) { - g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } Pump::~Pump() @@ -119,7 +118,6 @@ Pump::~Pump() osl_joinWithThread( m_aThread ); osl_destroyThread( m_aThread ); } - g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } void Pump::fireError( const Any & exception ) diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index 7a6e45318614..637534d32088 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -188,19 +188,10 @@ static struct ImplementationEntry g_entries[] = { 0, 0, 0, 0, 0, 0 } }; -extern "C" -{ -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL uuresolver_component_canUnload( TimeValue *pTime ) -{ - return g_moduleCount.canUnload( &g_moduleCount , pTime ); -} - -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL uuresolver_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uuresolver_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/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index f285d1346898..c66037eaf226 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -49,19 +49,10 @@ static struct ImplementationEntry gServiceEntries[] = { 0, 0, 0, 0, 0, 0 } }; -extern "C" -{ - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL presenter_component_canUnload( TimeValue *pTime ) - { - return g_moduleCount.canUnload( &g_moduleCount , pTime ); - } - - SAL_DLLPUBLIC_EXPORT void * SAL_CALL presenter_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL presenter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) - { - return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries); - } - +{ + return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries); } } } // end of namespace sdext::presenter 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 <rtl/unload.h> #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <salhelper/simplereferenceobject.hxx> @@ -28,8 +27,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/RuntimeException.hpp> -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 <rtl/unload.h> - #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 ); } //========================================================================= diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx index f2e6081be9ec..71459fbbef5f 100644 --- a/vcl/aqua/source/dtrans/DragSource.cxx +++ b/vcl/aqua/source/dtrans/DragSource.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/awt/MouseButton.hpp> -#include "rtl/unload.h" #include "rtl/ustring.hxx" #include "comphelper/makesequence.hxx" diff --git a/vcl/aqua/source/dtrans/DragSourceContext.cxx b/vcl/aqua/source/dtrans/DragSourceContext.cxx index b5689c133c3d..1eb4fe3ac78e 100644 --- a/vcl/aqua/source/dtrans/DragSourceContext.cxx +++ b/vcl/aqua/source/dtrans/DragSourceContext.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include "DragSourceContext.hxx" -#include <rtl/unload.h> using namespace com::sun::star::datatransfer::dnd; diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx index 6c359cc93430..27cda75f1605 100644 --- a/vcl/aqua/source/dtrans/DropTarget.cxx +++ b/vcl/aqua/source/dtrans/DropTarget.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp> -#include <rtl/unload.h> #include "comphelper/makesequence.hxx" #include <cppuhelper/interfacecontainer.hxx> |