[Libreoffice-commits] .: io/source
io/source/connector/connector.cxx | 40 ++---
io/source/connector/connector.hxx | 12 +--
io/source/connector/ctr_pipe.cxx |2 -
io/source/connector/ctr_socket.cxx | 10 -
4 files changed, 28 insertions(+), 36 deletions(-)
New commits:
commit 8967f80a50cd59199cf77d3b2eccdc57095d8c02
Author: José Guilherme Vanz guilherme@gmail.com
Date: Fri Nov 30 22:53:43 2012 -0200
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: I9446ddf13ba18d2d80639afc9e1b61234945b115
Signed-off-by: José Guilherme Vanz guilherme@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1200
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/io/source/connector/connector.cxx
b/io/source/connector/connector.cxx
index 9ba335b..38c2aee 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -94,9 +94,7 @@ namespace stoc_connector
Reference XConnection r;
if ( aDesc.getName() == pipe )
{
-rtl::OUString aName(
-aDesc.getParameter(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(name;
+OUString aName(aDesc.getParameter(name));
PipeConnection *pConn = new PipeConnection(
sConnectionDescription );
@@ -106,43 +104,37 @@ namespace stoc_connector
}
else
{
-OUString sMessage =
OUString(RTL_CONSTASCII_USTRINGPARAM(Connector : couldn't connect to pipe ));
+OUString sMessage(Connector : couldn't connect to pipe );
sMessage += aName;
-sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM(());
+sMessage += (;
sMessage += OUString::valueOf( (sal_Int32 )
pConn-m_pipe.getError() );
-sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM()));
+sMessage += );
delete pConn;
throw NoConnectException( sMessage ,Reference XInterface
() );
}
}
else if ( aDesc.getName() == socket )
{
-rtl::OUString aHost;
-if (aDesc.hasParameter(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(host
-aHost = aDesc.getParameter(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(host)));
+OUString aHost;
+if (aDesc.hasParameter(host))
+aHost = aDesc.getParameter(host);
else
-aHost = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- localhost));
+aHost = localhost;
sal_uInt16 nPort = static_cast sal_uInt16 (
-aDesc.getParameter(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(port))).
+aDesc.getParameter(port).
toInt32());
bool bTcpNoDelay
-= aDesc.getParameter(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- tcpnodelay))).toInt32() != 0;
+= aDesc.getParameter(tcpnodelay).toInt32() != 0;
SocketConnection *pConn = new SocketConnection(
sConnectionDescription);
SocketAddr AddrTarget( aHost.pData, nPort );
if(pConn-m_socket.connect(AddrTarget) != osl_Socket_Ok)
{
-OUString sMessage =
OUString(RTL_CONSTASCII_USTRINGPARAM(Connector : couldn't connect to socket
());
+OUString sMessage(Connector : couldn't connect to socket
();
OUString sError = pConn-m_socket.getErrorAsString();
sMessage += sError;
-sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM()));
+sMessage += );
delete pConn;
throw NoConnectException( sMessage, Reference XInterface
() );
}
@@ -157,7 +149,7 @@ namespace stoc_connector
}
else
{
-OUString delegatee =
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.connection.Connector.));
+OUString delegatee(com.sun.star.connection.Connector.);
delegatee += aDesc.getName();
OSL_TRACE(
@@ -169,7 +161,7 @@ namespace stoc_connector
if(!xConnector.is())
{
-OUString message(RTL_CONSTASCII_USTRINGPARAM(Connector:
unknown delegatee ));
+
[Libreoffice-commits] .: io/source
io/source/TextInputStream/TextInputStream.cxx |6 +++---
io/source/TextOutputStream/TextOutputStream.cxx |6 +++---
io/source/stm/odata.cxx | 16
io/source/stm/omark.cxx | 18 +-
io/source/stm/opipe.cxx | 18 +-
io/source/stm/opump.cxx | 10 +-
6 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit f73201e54af8c3e36342811653dd5fbcafb291fb
Author: José Guilherme Vanz guilherme@gmail.com
Date: Fri Nov 30 22:00:48 2012 -0200
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: I410016990579e4a05843cfe396832a5fc8435e70
Signed-off-by: José Guilherme Vanz guilherme@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1210
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/io/source/TextInputStream/TextInputStream.cxx
b/io/source/TextInputStream/TextInputStream.cxx
index 5e87cf6..a2fe774 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -180,7 +180,7 @@ OUString OTextInputStream::implReadString( const Sequence
sal_Unicode Delimi
OUString aRetStr;
if( !mbEncodingInitialized )
{
-OUString aUtf8Str( RTL_CONSTASCII_USTRINGPARAM(utf8) );
+OUString aUtf8Str(utf8);
setEncoding( aUtf8Str );
}
if( !mbEncodingInitialized )
@@ -439,13 +439,13 @@ Reference XInterface SAL_CALL
TextInputStream_CreateInstance(
OUString TextInputStream_getImplementationName()
{
-return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+return OUString ( IMPLEMENTATION_NAME );
}
Sequence OUString TextInputStream_getSupportedServiceNames()
{
Sequence OUString seqNames(1);
-seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(
SERVICE_NAME ) );
+seqNames.getArray()[0] = SERVICE_NAME;
return seqNames;
}
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx
b/io/source/TextOutputStream/TextOutputStream.cxx
index beabc01..a9916b6 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -167,7 +167,7 @@ void OTextOutputStream::writeString( const OUString
aString )
{
if( !mbEncodingInitialized )
{
-OUString aUtf8Str( RTL_CONSTASCII_USTRINGPARAM(utf8) );
+OUString aUtf8Str(utf8);
setEncoding( aUtf8Str );
}
if( !mbEncodingInitialized )
@@ -236,14 +236,14 @@ Reference XInterface SAL_CALL
TextOutputStream_CreateInstance(
OUString TextOutputStream_getImplementationName() SAL_THROW( () )
{
-return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+return OUString( IMPLEMENTATION_NAME );
}
Sequence OUString TextOutputStream_getSupportedServiceNames()
{
Sequence OUString seqNames(1);
-seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(
SERVICE_NAME ) );
+seqNames.getArray()[0] = SERVICE_NAME;
return seqNames;
}
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 51c7d39..c928de0 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -496,13 +496,13 @@ Reference XInterface SAL_CALL
ODataInputStream_CreateInstance(
OUString ODataInputStream_getImplementationName()
{
-return OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.comp.io.stm.DataInputStream ) );
+return OUString(com.sun.star.comp.io.stm.DataInputStream);
}
SequenceOUString ODataInputStream_getSupportedServiceNames(void)
{
SequenceOUString aRet(1);
-aRet.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.io.DataInputStream ) );
+aRet.getArray()[0] = com.sun.star.io.DataInputStream;
return aRet;
}
@@ -904,13 +904,13 @@ Reference XInterface SAL_CALL
ODataOutputStream_CreateInstance(
OUString ODataOutputStream_getImplementationName()
{
-return OUString(RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.comp.io.stm.DataOutputStream ) );
+return OUString(com.sun.star.comp.io.stm.DataOutputStream);
}
SequenceOUString ODataOutputStream_getSupportedServiceNames(void)
{
SequenceOUString aRet(1);
-aRet.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.io.DataOutputStream ) );
+aRet.getArray()[0] = com.sun.star.io.DataOutputStream;
return aRet;
}
@@ -1182,13 +1182,13 @@ Reference XInterface SAL_CALL
OObjectOutputStream_CreateInstance(
OUString OObjectOutputStream_getImplementationName()
{
-return OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.comp.io.stm.ObjectOutputStream ) );
+return OUString(com.sun.star.comp.io.stm.ObjectOutputStream);
}
[Libreoffice-commits] .: io/source
io/source/acceptor/acc_pipe.cxx | 10 +-
io/source/acceptor/acc_socket.cxx | 14 +++---
io/source/acceptor/acceptor.cxx | 32 ++--
io/source/acceptor/acceptor.hxx | 14 +++---
4 files changed, 33 insertions(+), 37 deletions(-)
New commits:
commit fead8bc949a3c61b29f353486feed3a882758c02
Author: José Guilherme Vanz guilherme@gmail.com
Date: Thu Nov 29 01:37:54 2012 -0200
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@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1194
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 73e3418..a8b8856 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -56,7 +56,7 @@ namespace io_acceptor
virtual void SAL_CALL close( )
throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
-virtual ::rtl::OUString SAL_CALL getDescription( )
+virtual OUString SAL_CALL getDescription( )
throw(::com::sun::star::uno::RuntimeException);
public:
::osl::StreamPipe m_pipe;
@@ -73,7 +73,7 @@ namespace io_acceptor
g_moduleCount.modCnt.acquire( g_moduleCount.modCnt );
// make it unique
-m_sDescription +=
OUString(RTL_CONSTASCII_USTRINGPARAM(,uniqueValue=));
+m_sDescription += OUString(,uniqueValue=);
m_sDescription += OUString::valueOf(
sal::static_int_castsal_Int64 (
reinterpret_cast sal_IntPtr (m_pipe)),
@@ -162,7 +162,7 @@ namespace io_acceptor
m_pipe = Pipe( m_sPipeName.pData , osl_Pipe_CREATE , osl::Security() );
if( ! m_pipe.is() )
{
-OUString error =
OUString(RTL_CONSTASCII_USTRINGPARAM(io.acceptor: Couldn't setup pipe ));
+OUString error = OUString(io.acceptor: Couldn't setup pipe );
error += m_sPipeName;
throw ConnectionSetupException( error, Reference XInterface ()
);
}
@@ -177,7 +177,7 @@ namespace io_acceptor
}
if( ! pipe.is() )
{
-OUString error =
OUString(RTL_CONSTASCII_USTRINGPARAM(io.acceptor: pipe already closed));
+OUString error = OUString(io.acceptor: pipe already closed);
error += m_sPipeName;
throw ConnectionSetupException( error, Reference XInterface ()
);
}
@@ -197,7 +197,7 @@ namespace io_acceptor
}
else
{
-OUString error =
OUString(RTL_CONSTASCII_USTRINGPARAM(io.acceptor: Couldn't setup pipe ));
+OUString error = OUString(io.acceptor: Couldn't setup pipe );
error += m_sPipeName;
throw ConnectionSetupException( error, Reference XInterface ());
}
diff --git a/io/source/acceptor/acc_socket.cxx
b/io/source/acceptor/acc_socket.cxx
index 8cfcfb6..1e50814 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -85,7 +85,7 @@ namespace io_acceptor {
virtual void SAL_CALL close( )
throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
-virtual ::rtl::OUString SAL_CALL getDescription( )
+virtual OUString SAL_CALL getDescription( )
throw(::com::sun::star::uno::RuntimeException);
// XConnectionBroadcaster
@@ -100,7 +100,7 @@ namespace io_acceptor {
::osl::StreamSocket m_socket;
::osl::SocketAddr m_addr;
oslInterlockedCount m_nStatus;
-::rtl::OUString m_sDescription;
+OUString m_sDescription;
::osl::Mutex _mutex;
sal_Bool _started;
@@ -164,7 +164,7 @@ namespace io_acceptor {
{
g_moduleCount.modCnt.acquire( g_moduleCount.modCnt );
// make it unique
-m_sDescription += OUString( RTL_CONSTASCII_USTRINGPARAM(
,uniqueValue= ) );
+m_sDescription += OUString( ,uniqueValue= ) ;
m_sDescription += OUString::valueOf(
sal::static_int_cast sal_Int64 (
reinterpret_cast sal_IntPtr (m_socket)),
@@ -210,7 +210,7 @@ namespace io_acceptor {
if(i != nBytesToRead)
{
-OUString
message(RTL_CONSTASCII_USTRINGPARAM(acc_socket.cxx:SocketConnection::read:
error - ));
+OUString message(acc_socket.cxx:SocketConnection::read: error
- );
message += m_socket.getErrorAsString();
IOException ioException(message,
ReferenceXInterface(static_castXConnection *(this)));
@@ -227,7
