diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:16:41 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:16:41 +0000 |
commit | 6af2105b53c85d20cee1a76b5b7d9823ee731923 (patch) | |
tree | 877f2c09dc8ac5f50deef032c1e6dff0308b9b8e /io/source/connector | |
parent | INTEGRATION: CWS warnings01 (1.6.122); FILE MERGED (diff) | |
download | core-6af2105b53c85d20cee1a76b5b7d9823ee731923.tar.gz core-6af2105b53c85d20cee1a76b5b7d9823ee731923.zip |
INTEGRATION: CWS warnings01 (1.16.22); FILE MERGED
2006/01/25 20:30:41 sb 1.16.22.4: RESYNC: (1.17-1.18); FILE MERGED
2005/09/22 20:27:48 sb 1.16.22.3: RESYNC: (1.16-1.17); FILE MERGED
2005/09/07 14:14:52 sb 1.16.22.2: #i53898# Made code warning-free.
2005/09/01 08:14:27 sb 1.16.22.1: #i53898# Made code warning-free.
Diffstat (limited to 'io/source/connector')
-rw-r--r-- | io/source/connector/connector.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index cc1883058f50..3f0d57ee35b9 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -4,9 +4,9 @@ * * $RCSfile: connector.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2006-01-19 18:21:59 $ + * last change: $Author: hr $ $Date: 2006-06-20 00:16:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -83,8 +83,8 @@ namespace stoc_connector }; OConnector::OConnector(const Reference< XComponentContext > &xCtx) - : _xCtx( xCtx ) - , _xSMgr( xCtx->getServiceManager() ) + : _xSMgr( xCtx->getServiceManager() ) + , _xCtx( xCtx ) { g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } @@ -115,7 +115,7 @@ namespace stoc_connector aDesc.getParameter( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")))); - PipeConnection *pConn = new PipeConnection( aName, sConnectionDescription ); + PipeConnection *pConn = new PipeConnection( sConnectionDescription ); if( pConn->m_pipe.create( aName.pData, osl_Pipe_OPEN, osl::Security() ) ) { @@ -152,9 +152,7 @@ namespace stoc_connector rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "tcpnodelay"))).toInt32() != 0; - SocketConnection *pConn = new SocketConnection( aHost, - nPort, - sConnectionDescription); + SocketConnection *pConn = new SocketConnection( sConnectionDescription); SocketAddr AddrTarget( aHost.pData, nPort ); if(pConn->m_socket.connect(AddrTarget) != osl_Socket_Ok) @@ -280,7 +278,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) //================================================================================================== void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) + const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } |