diff options
Diffstat (limited to 'io/source/acceptor')
-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 |
4 files changed, 1 insertions, 21 deletions
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: |