diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:16:06 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:16:06 +0000 |
commit | 5d3292e5cfcaf1af1fc9cc6f4ce4082f0f39d177 (patch) | |
tree | 031e31ae7fc4a2461cad017f2f49361c7f55958d /io | |
parent | abe5d9d1d8b5621e0c8d10a45aefa67acc27b3e1 (diff) |
INTEGRATION: CWS warnings01 (1.11.126); FILE MERGED
2005/11/08 18:06:50 pl 1.11.126.5: #i53898# fix a visbility issue
2005/09/22 20:26:51 sb 1.11.126.4: RESYNC: (1.11-1.12); FILE MERGED
2005/09/07 14:14:50 sb 1.11.126.3: #i53898# Made code warning-free.
2005/09/06 10:11:10 sb 1.11.126.2: #i53898# sal::reinterpret_int_cast is not needed.
2005/09/01 08:14:27 sb 1.11.126.1: #i53898# Made code warning-free.
Diffstat (limited to 'io')
-rw-r--r-- | io/source/acceptor/acc_socket.cxx | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index 13f4a6798584..0526eb2314d9 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -4,9 +4,9 @@ * * $RCSfile: acc_socket.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:27:33 $ + * last change: $Author: hr $ $Date: 2006-06-20 00:16:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -84,7 +84,7 @@ namespace io_acceptor { { public: - SocketConnection( const ::rtl::OUString & s , sal_uInt16 nPort, const OUString & sConnectionDescription ); + SocketConnection( const OUString & sConnectionDescription ); ~SocketConnection(); virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes, @@ -154,8 +154,8 @@ namespace io_acceptor { void operator () (Reference<XStreamListener> xStreamListener); }; - callError::callError(const Any & any) - : any(any) + callError::callError(const Any & aAny) + : any(aAny) { } @@ -170,9 +170,7 @@ namespace io_acceptor { } - SocketConnection::SocketConnection( const OUString &s, - sal_uInt16 nPort, - const OUString &sConnectionDescription) : + SocketConnection::SocketConnection( const OUString &sConnectionDescription) : m_nStatus( 0 ), m_sDescription( sConnectionDescription ), _started(sal_False), @@ -182,7 +180,10 @@ namespace io_acceptor { g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); // make it unique m_sDescription += OUString( RTL_CONSTASCII_USTRINGPARAM( ",uniqueValue=" ) ); - m_sDescription += OUString::valueOf( (sal_Int64) &m_socket , 10 ); + m_sDescription += OUString::valueOf( + sal::static_int_cast< sal_Int64 >( + reinterpret_cast< sal_IntPtr >(&m_socket)), + 10 ); } SocketConnection::~SocketConnection() @@ -335,11 +336,11 @@ namespace io_acceptor { sal_uInt16 nPort, sal_Bool bTcpNoDelay, const OUString &sConnectionDescription) : - m_bClosed( sal_False ), m_sSocketName( sSocketName ), - m_nPort( nPort ), m_sConnectionDescription( sConnectionDescription ), - m_bTcpNoDelay( bTcpNoDelay ) + m_nPort( nPort ), + m_bTcpNoDelay( bTcpNoDelay ), + m_bClosed( sal_False ) { } @@ -385,7 +386,7 @@ namespace io_acceptor { Reference< XConnection > SocketAcceptor::accept( ) { - SocketConnection *pConn = new SocketConnection( m_sSocketName , m_nPort, m_sConnectionDescription ); + SocketConnection *pConn = new SocketConnection( m_sConnectionDescription ); if( m_socket.acceptConnection( pConn->m_socket )!= osl_Socket_Ok ) { |