summaryrefslogtreecommitdiff
path: root/io/source/acceptor/acceptor.cxx
diff options
context:
space:
mode:
authorJosé Guilherme Vanz <guilherme.sft@gmail.com>2012-11-29 01:37:54 -0200
committerOlivier Hallot <olivier.hallot@alta.org.br>2012-11-29 10:21:05 +0000
commitfead8bc949a3c61b29f353486feed3a882758c02 (patch)
treeb01632dcbfcd70b55057ea87216c47c36631d8cd /io/source/acceptor/acceptor.cxx
parent43bf22bb404c4d5339564229eabd32a5c0c9381a (diff)
Removal ::rtl:: prefixes and macros in IO
This commit removes some ::rtl:: prefixes and RTL_CONSTASCII_STRINGPARAM, RTL_CONSTASCII_USTRINGPARAM macros in IO. Change-Id: I823fcdfe46d4d4093118f6eaab89c1ce42883a6c Signed-off-by: José Guilherme Vanz <guilherme.sft@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/1194 Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br> Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
Diffstat (limited to 'io/source/acceptor/acceptor.cxx')
-rw-r--r--io/source/acceptor/acceptor.cxx32
1 files changed, 14 insertions, 18 deletions
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index eb94ca532395..a8bd18c7839e 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -109,7 +109,7 @@ namespace io_acceptor
{
if( *m_pFlag )
{
- OUString sMessage( RTL_CONSTASCII_USTRINGPARAM( "AlreadyAcceptingException :" ) );
+ OUString sMessage( "AlreadyAcceptingException :" );
sMessage += sConnectionDescription;
throw AlreadyAcceptingException( sMessage , Reference< XInterface > () );
}
@@ -140,8 +140,7 @@ namespace io_acceptor
m_sLastDescription != sConnectionDescription )
{
// instantiate another acceptor for different ports
- OUString sMessage = OUString( RTL_CONSTASCII_USTRINGPARAM(
- "acceptor::accept called multiple times with different conncetion strings\n" ) );
+ OUString sMessage = OUString("acceptor::accept called multiple times with different conncetion strings\n" );
throw ConnectionSetupException( sMessage, Reference< XInterface > () );
}
@@ -153,10 +152,9 @@ namespace io_acceptor
cppu::UnoUrlDescriptor aDesc(sConnectionDescription);
if ( aDesc.getName() == "pipe" )
{
- rtl::OUString aName(
+ OUString aName(
aDesc.getParameter(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "name"))));
+ OUString("name")));
m_pPipe = new PipeAcceptor(aName, sConnectionDescription);
@@ -176,22 +174,20 @@ namespace io_acceptor
}
else if ( aDesc.getName() == "socket" )
{
- rtl::OUString aHost;
+ OUString aHost;
if (aDesc.hasParameter(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("host"))))
+ OUString("host")))
aHost = aDesc.getParameter(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("host")));
+ OUString("host"));
else
- aHost = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "localhost"));
+ aHost = OUString("localhost");
sal_uInt16 nPort = static_cast< sal_uInt16 >(
aDesc.getParameter(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("port"))).
+ OUString("port")).
toInt32());
bool bTcpNoDelay
= aDesc.getParameter(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "tcpnodelay"))).toInt32() != 0;
+ OUString("tcpnodelay")).toInt32() != 0;
m_pSocket = new SocketAcceptor(
aHost, nPort, bTcpNoDelay, sConnectionDescription);
@@ -212,7 +208,7 @@ namespace io_acceptor
}
else
{
- OUString delegatee = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor."));
+ OUString delegatee = OUString("com.sun.star.connection.Acceptor.");
delegatee += aDesc.getName();
OSL_TRACE(
@@ -224,7 +220,7 @@ namespace io_acceptor
if(!_xAcceptor.is())
{
- OUString message(RTL_CONSTASCII_USTRINGPARAM("Acceptor: unknown delegatee "));
+ OUString message("Acceptor: unknown delegatee ");
message += delegatee;
throw ConnectionSetupException(message, Reference<XInterface>());
@@ -278,7 +274,7 @@ namespace io_acceptor
OUString acceptor_getImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+ return OUString( IMPLEMENTATION_NAME );
}
Reference< XInterface > SAL_CALL acceptor_CreateInstance( const Reference< XComponentContext > & xCtx)
@@ -289,7 +285,7 @@ namespace io_acceptor
Sequence< OUString > acceptor_getSupportedServiceNames()
{
Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
+ seqNames.getArray()[0] = OUString(SERVICE_NAME);
return seqNames;
}