diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:17:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:17:15 +0000 |
| commit | 627a43954770e315c562ed066b2febda2c738484 (patch) | |
| tree | 3af6a6a101407002f4669b2e1bd7b6c6a870a110 /io | |
| parent | d903c09cf38aec4655f23e82b1a057388df20f59 (diff) | |
INTEGRATION: CWS warnings01 (1.7.126); FILE MERGED
2005/11/08 18:06:50 pl 1.7.126.5: #i53898# fix a visbility issue
2005/09/22 20:28:09 sb 1.7.126.4: RESYNC: (1.7-1.8); FILE MERGED
2005/09/07 14:14:53 sb 1.7.126.3: #i53898# Made code warning-free.
2005/09/06 10:11:11 sb 1.7.126.2: #i53898# sal::reinterpret_int_cast is not needed.
2005/09/01 08:14:28 sb 1.7.126.1: #i53898# Made code warning-free.
Diffstat (limited to 'io')
| -rw-r--r-- | io/source/connector/ctr_socket.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx index efb9a18a1974..7606b9686e81 100644 --- a/io/source/connector/ctr_socket.cxx +++ b/io/source/connector/ctr_socket.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ctr_socket.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:29:31 $ + * last change: $Author: hr $ $Date: 2006-06-20 00:17:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,8 +76,8 @@ namespace stoc_connector { void operator () (Reference<XStreamListener> xStreamListener); }; - callError::callError(const Any & any) - : any(any) + callError::callError(const Any & aAny) + : any(aAny) { } @@ -92,7 +92,7 @@ namespace stoc_connector { } - 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), @@ -102,7 +102,10 @@ namespace stoc_connector { // make it unique g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); 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() |