diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-24 09:36:05 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-24 09:36:05 +0000 |
commit | 5355c87fb2f634f20fd5e3dfd0ae14c5de939f59 (patch) | |
tree | df9f4a9ddc6a90700f38e3dcd38632bd2ec4250b /io | |
parent | fce6acbc9b89066961db7644469e29229b06fa69 (diff) |
INTEGRATION: CWS sb56 (1.17.2); FILE MERGED
2006/07/07 09:10:29 sb 1.17.2.1: #i67105# Made code compile (warning-free) with debug=x.
Diffstat (limited to 'io')
-rw-r--r-- | io/source/acceptor/acceptor.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 670836c73442..4b009170ab7e 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -4,9 +4,9 @@ * * $RCSfile: acceptor.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2006-06-20 00:16:18 $ + * last change: $Author: ihi $ $Date: 2006-08-24 10:36:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -143,10 +143,10 @@ namespace io_acceptor IllegalArgumentException, RuntimeException) { -#if OSL_DEBUG_LEVEL > 1 - OString tmp = OUStringToOString(sConnectionDescription, RTL_TEXTENCODING_ASCII_US); - OSL_TRACE("acceptor %s\n", tmp.getStr()); -#endif + OSL_TRACE( + "acceptor %s\n", + OUStringToOString( + sConnectionDescription, RTL_TEXTENCODING_ASCII_US).getStr()); // if there is a thread alread accepting in this object, throw an exception. struct BeingInAccept guard( &m_bInAccept, sConnectionDescription ); @@ -232,10 +232,10 @@ namespace io_acceptor OUString delegatee = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor.")); delegatee += aDesc.getName(); -#if OSL_DEBUG_LEVEL > 1 - OString tmp = OUStringToOString(delegatee, RTL_TEXTENCODING_ASCII_US); - OSL_TRACE("trying to get service %s\n", tmp.getStr()); -#endif + OSL_TRACE( + "trying to get service %s\n", + OUStringToOString( + delegatee, RTL_TEXTENCODING_ASCII_US).getStr()); _xAcceptor = Reference<XAcceptor>( _xSMgr->createInstanceWithContext(delegatee, _xCtx), UNO_QUERY); |