From c954581637cdd6b76a14a74d17068c1d3d481021 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 25 Oct 2010 12:47:12 +0100 Subject: micro optimizations --- io/source/acceptor/acc_pipe.cxx | 8 ++++---- io/source/acceptor/acceptor.cxx | 2 +- io/source/connector/connector.cxx | 12 ++++++------ io/source/connector/ctr_pipe.cxx | 2 +- io/source/stm/omark.cxx | 2 +- io/source/stm/opump.cxx | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'io') diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index c042599d07ac..27a298bf5c7f 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -84,7 +84,7 @@ namespace io_acceptor g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); // make it unique - m_sDescription += OUString::createFromAscii( ",uniqueValue=" ); + m_sDescription += OUString(RTL_CONSTASCII_USTRINGPARAM(",uniqueValue=")); m_sDescription += OUString::valueOf( sal::static_int_cast( reinterpret_cast< sal_IntPtr >(&m_pipe)), @@ -167,7 +167,7 @@ namespace io_acceptor m_pipe = Pipe( m_sPipeName.pData , osl_Pipe_CREATE , osl::Security() ); if( ! m_pipe.is() ) { - OUString error = OUString::createFromAscii( "io.acceptor: Couldn't setup pipe " ); + OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: Couldn't setup pipe ")); error += m_sPipeName; throw ConnectionSetupException( error, Reference< XInterface > () ); } @@ -182,7 +182,7 @@ namespace io_acceptor } if( ! pipe.is() ) { - OUString error = OUString::createFromAscii( "io.acceptor: pipe already closed" ); + OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: pipe already closed")); error += m_sPipeName; throw ConnectionSetupException( error, Reference< XInterface > () ); } @@ -202,7 +202,7 @@ namespace io_acceptor } else { - OUString error = OUString::createFromAscii( "io.acceptor: Couldn't setup pipe " ); + OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: Couldn't setup pipe ")); error += m_sPipeName; throw ConnectionSetupException( error, Reference< XInterface > ()); } diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 92b9a887d0d5..3edca9d0841e 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -308,7 +308,7 @@ namespace io_acceptor if( !pNames ) { static Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString::createFromAscii( SERVICE_NAME ); + seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME)); pNames = &seqNames; } } diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 9e50faf31e9b..4ba32fc54a26 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -119,11 +119,11 @@ namespace stoc_connector } else { - OUString sMessage = OUString::createFromAscii( "Connector : couldn't connect to pipe " ); + OUString sMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Connector : couldn't connect to pipe ")); sMessage += aName; - sMessage += OUString::createFromAscii( "(" ); + sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM("(")); sMessage += OUString::valueOf( (sal_Int32 ) pConn->m_pipe.getError() ); - sMessage += OUString::createFromAscii( ")" ); + sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); delete pConn; throw NoConnectException( sMessage ,Reference< XInterface > () ); } @@ -153,10 +153,10 @@ namespace stoc_connector SocketAddr AddrTarget( aHost.pData, nPort ); if(pConn->m_socket.connect(AddrTarget) != osl_Socket_Ok) { - OUString sMessage = OUString::createFromAscii( "Connector : couldn't connect to socket (" ); + OUString sMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Connector : couldn't connect to socket (")); OUString sError = pConn->m_socket.getErrorAsString(); sMessage += sError; - sMessage += OUString::createFromAscii( ")" ); + sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); delete pConn; throw NoConnectException( sMessage, Reference < XInterface > () ); } @@ -211,7 +211,7 @@ namespace stoc_connector if( !pNames ) { static Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString::createFromAscii( SERVICE_NAME ); + seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME)); pNames = &seqNames; } } diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx index 1f406f2cd2fc..3069d0523794 100644 --- a/io/source/connector/ctr_pipe.cxx +++ b/io/source/connector/ctr_pipe.cxx @@ -46,7 +46,7 @@ namespace stoc_connector { { g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); // make it unique - m_sDescription += OUString::createFromAscii( ",uniqueValue=" ); + m_sDescription += OUString(RTL_CONSTASCII_USTRINGPARAM(",uniqueValue=")); m_sDescription += OUString::valueOf( sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >(&m_pipe)), diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index b99d8ed948d2..792920c2667a 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -730,7 +730,7 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip) { if ( nBytesToSkip < 0 ) throw BufferSizeExceededException( - ::rtl::OUString::createFromAscii( "precondition not met: XInputStream::skipBytes: non-negative integer required!" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("precondition not met: XInputStream::skipBytes: non-negative integer required!")), *this ); diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 5b3181fa5844..0d20908daae1 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -280,7 +280,7 @@ void Pump::run() if( ! rInput.is() ) { NotConnectedException exception( - OUString::createFromAscii( "no input stream set" ) , Reference((OWeakObject*)this) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("no input stream set")) , Reference((OWeakObject*)this) ); throw exception; } Sequence< sal_Int8 > aData; @@ -289,7 +289,7 @@ void Pump::run() if( ! rOutput.is() ) { NotConnectedException exception( - OUString::createFromAscii( "no output stream set" ) , Reference( (OWeakObject*)this) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("no output stream set")) , Reference( (OWeakObject*)this) ); throw exception; } rOutput->writeBytes( aData ); -- cgit