diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:15:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:15:53 +0000 |
| commit | abe5d9d1d8b5621e0c8d10a45aefa67acc27b3e1 (patch) | |
| tree | 47a4810f0525844cfa4f65c1e908962ff6b39ddf /io | |
| parent | c37c235f0d1d760e1a3c1d0d221f1fa782b077e9 (diff) | |
INTEGRATION: CWS warnings01 (1.6.22); FILE MERGED
2005/09/22 20:26:40 sb 1.6.22.4: RESYNC: (1.6-1.7); FILE MERGED
2005/09/07 14:14:50 sb 1.6.22.3: #i53898# Made code warning-free.
2005/09/06 10:11:10 sb 1.6.22.2: #i53898# sal::reinterpret_int_cast is not needed.
2005/09/01 08:14:26 sb 1.6.22.1: #i53898# Made code warning-free.
Diffstat (limited to 'io')
| -rw-r--r-- | io/source/acceptor/acc_pipe.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index 8c12fa1ae1f5..a20f5a7d748c 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -4,9 +4,9 @@ * * $RCSfile: acc_pipe.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:27:19 $ + * last change: $Author: hr $ $Date: 2006-06-20 00:15:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,7 +56,7 @@ namespace io_acceptor public MyPipeConnection { public: - PipeConnection( const OUString & s , const OUString &sConnectionDescription); + PipeConnection( const OUString &sConnectionDescription); ~PipeConnection(); virtual sal_Int32 SAL_CALL read( Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) @@ -81,7 +81,7 @@ namespace io_acceptor - PipeConnection::PipeConnection( const OUString &s, const OUString &sConnectionDescription) : + PipeConnection::PipeConnection( const OUString &sConnectionDescription) : m_nStatus( 0 ), m_sDescription( sConnectionDescription ) { @@ -89,7 +89,10 @@ namespace io_acceptor // make it unique m_sDescription += OUString::createFromAscii( ",uniqueValue=" ); - m_sDescription += OUString::valueOf( (sal_Int64) &m_pipe , 10 ); + m_sDescription += OUString::valueOf( + sal::static_int_cast<sal_Int64 >( + reinterpret_cast< sal_IntPtr >(&m_pipe)), + 10 ); } PipeConnection::~PipeConnection() @@ -112,8 +115,6 @@ namespace io_acceptor else { throw IOException(); } - - return 0; } void PipeConnection::write( const Sequence < sal_Int8 > &seq ) @@ -158,9 +159,9 @@ namespace io_acceptor * PipeAcceptor **************/ PipeAcceptor::PipeAcceptor( const OUString &sPipeName , const OUString & sConnectionDescription) : - m_bClosed( sal_False ), m_sPipeName( sPipeName ), - m_sConnectionDescription( sConnectionDescription ) + m_sConnectionDescription( sConnectionDescription ), + m_bClosed( sal_False ) { } @@ -189,7 +190,7 @@ namespace io_acceptor error += m_sPipeName; throw ConnectionSetupException( error, Reference< XInterface > () ); } - PipeConnection *pConn = new PipeConnection( m_sPipeName , m_sConnectionDescription ); + PipeConnection *pConn = new PipeConnection( m_sConnectionDescription ); oslPipeError status = pipe.accept( pConn->m_pipe ); |