diff options
Diffstat (limited to 'io')
-rw-r--r-- | io/source/TextInputStream/TextInputStream.cxx | 14 | ||||
-rw-r--r-- | io/source/TextOutputStream/TextOutputStream.cxx | 13 | ||||
-rw-r--r-- | io/source/acceptor/acc_pipe.cxx | 3 | ||||
-rw-r--r-- | io/source/acceptor/acc_socket.cxx | 2 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.cxx | 14 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.hxx | 3 | ||||
-rw-r--r-- | io/source/connector/connector.cxx | 14 | ||||
-rw-r--r-- | io/source/connector/connector.hxx | 3 | ||||
-rw-r--r-- | io/source/connector/ctr_pipe.cxx | 2 | ||||
-rw-r--r-- | io/source/connector/ctr_socket.cxx | 2 | ||||
-rw-r--r-- | io/source/stm/factreg.cxx | 13 | ||||
-rw-r--r-- | io/source/stm/factreg.hxx | 3 | ||||
-rw-r--r-- | io/source/stm/odata.cxx | 8 | ||||
-rw-r--r-- | io/source/stm/omark.cxx | 4 | ||||
-rw-r--r-- | io/source/stm/opipe.cxx | 2 | ||||
-rw-r--r-- | io/source/stm/opump.cxx | 2 |
16 files changed, 5 insertions, 97 deletions
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 ) |