diff options
-rw-r--r-- | io/qa/textinputstream.cxx | 4 | ||||
-rw-r--r-- | io/source/TextInputStream/TextInputStream.cxx | 12 | ||||
-rw-r--r-- | io/source/TextOutputStream/TextOutputStream.cxx | 8 | ||||
-rw-r--r-- | io/source/acceptor/acc_pipe.cxx | 6 | ||||
-rw-r--r-- | io/source/acceptor/acc_socket.cxx | 4 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.cxx | 16 | ||||
-rw-r--r-- | io/source/connector/connector.cxx | 16 | ||||
-rw-r--r-- | io/source/connector/ctr_pipe.cxx | 6 | ||||
-rw-r--r-- | io/source/connector/ctr_socket.cxx | 4 | ||||
-rw-r--r-- | io/source/stm/odata.cxx | 16 | ||||
-rw-r--r-- | io/source/stm/omark.cxx | 18 | ||||
-rw-r--r-- | io/source/stm/opipe.cxx | 18 | ||||
-rw-r--r-- | io/source/stm/opump.cxx | 10 | ||||
-rw-r--r-- | io/source/stm/streamhelper.cxx | 8 |
14 files changed, 73 insertions, 73 deletions
diff --git a/io/qa/textinputstream.cxx b/io/qa/textinputstream.cxx index dfeb478f975c..ddfbd3afd134 100644 --- a/io/qa/textinputstream.cxx +++ b/io/qa/textinputstream.cxx @@ -86,7 +86,7 @@ private: void checkClosed() { if (!open_) { throw css::io::NotConnectedException( - "test input stream already closed"); + u"test input stream already closed"_ustr); } } @@ -114,7 +114,7 @@ void Test::testReadLine() { css::io::TextInputStream::create(getComponentContext())); s->setInputStream(new Input); OUString l(s->readLine()); - CPPUNIT_ASSERT_EQUAL(OUString("123456789"), l); + CPPUNIT_ASSERT_EQUAL(u"123456789"_ustr, l); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 29699e9adf9c..4dd0bd50dc25 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -128,7 +128,7 @@ OTextInputStream::~OTextInputStream() void OTextInputStream::checkNull() { if (mxStream==nullptr){ - throw RuntimeException("Uninitialized object"); + throw RuntimeException(u"Uninitialized object"_ustr); } } @@ -163,7 +163,7 @@ OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimi OUString aRetStr; if( !mbEncodingInitialized ) { - setEncoding( "utf8" ); + setEncoding( u"utf8"_ustr ); } if( !mbEncodingInitialized ) return aRetStr; @@ -323,12 +323,12 @@ sal_Int32 OTextInputStream::implReadNext() } catch( NotConnectedException& ) { - throw IOException("Not connected"); + throw IOException(u"Not connected"_ustr); //throw IOException( L"OTextInputStream::implReadString failed" ); } catch( BufferSizeExceededException& ) { - throw IOException("Buffer size exceeded"); + throw IOException(u"Buffer size exceeded"_ustr); } } @@ -392,7 +392,7 @@ Reference< XInputStream > OTextInputStream::getInputStream() OUString OTextInputStream::getImplementationName() { - return "com.sun.star.comp.io.TextInputStream"; + return u"com.sun.star.comp.io.TextInputStream"_ustr; } sal_Bool OTextInputStream::supportsService(const OUString& ServiceName) @@ -402,7 +402,7 @@ sal_Bool OTextInputStream::supportsService(const OUString& ServiceName) Sequence< OUString > OTextInputStream::getSupportedServiceNames() { - return { "com.sun.star.io.TextInputStream" }; + return { u"com.sun.star.io.TextInputStream"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index e8706b407843..f576b9881672 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -150,7 +150,7 @@ void OTextOutputStream::writeString( const OUString& aString ) checkOutputStream(); if( !mbEncodingInitialized ) { - setEncoding( "utf8" ); + setEncoding( u"utf8"_ustr ); } if( !mbEncodingInitialized ) return; @@ -195,7 +195,7 @@ void OTextOutputStream::closeOutput( ) void OTextOutputStream::checkOutputStream() const { if (! mxStream.is() ) - throw IOException("output stream is not initialized, you have to use setOutputStream first"); + throw IOException(u"output stream is not initialized, you have to use setOutputStream first"_ustr); } @@ -213,7 +213,7 @@ Reference< XOutputStream > OTextOutputStream::getOutputStream() OUString OTextOutputStream::getImplementationName() { - return "com.sun.star.comp.io.TextOutputStream"; + return u"com.sun.star.comp.io.TextOutputStream"_ustr; } sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName) @@ -223,7 +223,7 @@ sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName) Sequence< OUString > OTextOutputStream::getSupportedServiceNames() { - return { "com.sun.star.io.TextOutputStream" }; + return { u"com.sun.star.io.TextOutputStream"_ustr }; } diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index c3af874498de..19c8f5914370 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -74,7 +74,7 @@ namespace io_acceptor { if( m_nStatus ) { - throw IOException("pipe already closed"); + throw IOException(u"pipe already closed"_ustr); } if( aReadBytes.getLength() < nBytesToRead ) { @@ -94,11 +94,11 @@ namespace io_acceptor { if( m_nStatus ) { - throw IOException("pipe already closed"); + throw IOException(u"pipe already closed"_ustr); } if( m_pipe.write( seq.getConstArray() , seq.getLength() ) != seq.getLength() ) { - throw IOException("short write"); + throw IOException(u"short write"_ustr); } } diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index c211acdc3ab5..59de95ec5bd7 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -186,7 +186,7 @@ namespace io_acceptor { } else { - IOException ioException("acc_socket.cxx:SocketConnection::read: error - connection already closed", static_cast<XConnection *>(this)); + IOException ioException(u"acc_socket.cxx:SocketConnection::read: error - connection already closed"_ustr, static_cast<XConnection *>(this)); Any any; any <<= ioException; @@ -218,7 +218,7 @@ namespace io_acceptor { } else { - IOException ioException("acc_socket.cxx:SocketConnection::write: error - connection already closed", static_cast<XConnection *>(this)); + IOException ioException(u"acc_socket.cxx:SocketConnection::write: error - connection already closed"_ustr, static_cast<XConnection *>(this)); Any any; any <<= ioException; diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index af0883be9769..96e23da35631 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -111,7 +111,7 @@ Reference< XConnection > OAcceptor::accept( const OUString &sConnectionDescripti m_sLastDescription != sConnectionDescription ) { // instantiate another acceptor for different ports - throw ConnectionSetupException( "acceptor::accept called multiple times with different connection strings\n" ); + throw ConnectionSetupException( u"acceptor::accept called multiple times with different connection strings\n"_ustr ); } if( m_sLastDescription.isEmpty() ) @@ -124,7 +124,7 @@ Reference< XConnection > OAcceptor::accept( const OUString &sConnectionDescripti { OUString aName( aDesc.getParameter( - "name")); + u"name"_ustr)); m_pPipe.reset(new io_acceptor::PipeAcceptor(aName, sConnectionDescription)); @@ -145,18 +145,18 @@ Reference< XConnection > OAcceptor::accept( const OUString &sConnectionDescripti { OUString aHost; if (aDesc.hasParameter( - "host")) + u"host"_ustr)) aHost = aDesc.getParameter( - "host"); + u"host"_ustr); else aHost = "localhost"; sal_uInt16 nPort = static_cast< sal_uInt16 >( aDesc.getParameter( - "port"). + u"port"_ustr). toInt32()); bool bTcpNoDelay = aDesc.getParameter( - "tcpnodelay").toInt32() != 0; + u"tcpnodelay"_ustr).toInt32() != 0; m_pSocket.reset(new io_acceptor::SocketAcceptor( aHost, nPort, bTcpNoDelay, sConnectionDescription)); @@ -230,7 +230,7 @@ void SAL_CALL OAcceptor::stopAccepting( ) OUString OAcceptor::getImplementationName() { - return "com.sun.star.comp.io.Acceptor"; + return u"com.sun.star.comp.io.Acceptor"_ustr; } sal_Bool OAcceptor::supportsService(const OUString& ServiceName) @@ -240,7 +240,7 @@ sal_Bool OAcceptor::supportsService(const OUString& ServiceName) Sequence< OUString > OAcceptor::getSupportedServiceNames() { - return { "com.sun.star.connection.Acceptor" }; + return { u"com.sun.star.connection.Acceptor"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 15720b2423b2..a4426640749f 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -77,7 +77,7 @@ Reference< XConnection > SAL_CALL OConnector::connect( const OUString& sConnecti Reference< XConnection > r; if ( aDesc.getName() == "pipe" ) { - OUString aName(aDesc.getParameter("name")); + OUString aName(aDesc.getParameter(u"name"_ustr)); rtl::Reference<stoc_connector::PipeConnection> pConn(new stoc_connector::PipeConnection( sConnectionDescription )); @@ -97,22 +97,22 @@ Reference< XConnection > SAL_CALL OConnector::connect( const OUString& sConnecti else if ( aDesc.getName() == "socket" ) { OUString aHost; - if (aDesc.hasParameter("host")) - aHost = aDesc.getParameter("host"); + if (aDesc.hasParameter(u"host"_ustr)) + aHost = aDesc.getParameter(u"host"_ustr); else aHost = "localhost"; sal_uInt16 nPort = static_cast< sal_uInt16 >( - aDesc.getParameter("port"). + aDesc.getParameter(u"port"_ustr). toInt32()); bool bTcpNoDelay - = aDesc.getParameter("tcpnodelay").toInt32() != 0; + = aDesc.getParameter(u"tcpnodelay"_ustr).toInt32() != 0; rtl::Reference<stoc_connector::SocketConnection> pConn(new stoc_connector::SocketConnection( sConnectionDescription)); SocketAddr AddrTarget( aHost.pData, nPort ); if(pConn->m_socket.connect(AddrTarget) != osl_Socket_Ok) { - OUString sMessage("Connector : couldn't connect to socket ("); + OUString sMessage(u"Connector : couldn't connect to socket ("_ustr); OUString sError = pConn->m_socket.getErrorAsString(); sMessage += sError + ")"; throw NoConnectException( sMessage ); @@ -152,7 +152,7 @@ Reference< XConnection > SAL_CALL OConnector::connect( const OUString& sConnecti OUString OConnector::getImplementationName() { - return "com.sun.star.comp.io.Connector"; + return u"com.sun.star.comp.io.Connector"_ustr; } sal_Bool OConnector::supportsService(const OUString& ServiceName) @@ -162,7 +162,7 @@ sal_Bool OConnector::supportsService(const OUString& ServiceName) Sequence< OUString > OConnector::getSupportedServiceNames() { - return { "com.sun.star.connection.Connector" }; + return { u"com.sun.star.connection.Connector"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx index ba3ca7fb761b..cc5b4cb56f95 100644 --- a/io/source/connector/ctr_pipe.cxx +++ b/io/source/connector/ctr_pipe.cxx @@ -52,7 +52,7 @@ namespace stoc_connector { { if( m_nStatus ) { - throw IOException("pipe already closed"); + throw IOException(u"pipe already closed"_ustr); } if( aReadBytes.getLength() != nBytesToRead ) { @@ -66,11 +66,11 @@ namespace stoc_connector { { if( m_nStatus ) { - throw IOException("pipe already closed"); + throw IOException(u"pipe already closed"_ustr); } if( m_pipe.write( seq.getConstArray() , seq.getLength() ) != seq.getLength() ) { - throw IOException("short write"); + throw IOException(u"short write"_ustr); } } diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx index 0edb32ffc2d0..540de0db52cb 100644 --- a/io/source/connector/ctr_socket.cxx +++ b/io/source/connector/ctr_socket.cxx @@ -143,7 +143,7 @@ namespace stoc_connector { } else { - IOException ioException("ctr_socket.cxx:SocketConnection::read: error - connection already closed", static_cast<XConnection *>(this)); + IOException ioException(u"ctr_socket.cxx:SocketConnection::read: error - connection already closed"_ustr, static_cast<XConnection *>(this)); Any any; any <<= ioException; @@ -175,7 +175,7 @@ namespace stoc_connector { } else { - IOException ioException("ctr_socket.cxx:SocketConnection::write: error - connection already closed", static_cast<XConnection *>(this)); + IOException ioException(u"ctr_socket.cxx:SocketConnection::write: error - connection already closed"_ustr, static_cast<XConnection *>(this)); Any any; any <<= ioException; diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 881b0cda132a..7391a2062cce 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -388,7 +388,7 @@ Reference < XConnectable > ODataInputStream::getPredecessor() // XServiceInfo OUString ODataInputStream::getImplementationName() { - return "com.sun.star.comp.io.stm.DataInputStream"; + return u"com.sun.star.comp.io.stm.DataInputStream"_ustr; } // XServiceInfo @@ -400,7 +400,7 @@ sal_Bool ODataInputStream::supportsService(const OUString& ServiceName) // XServiceInfo Sequence< OUString > ODataInputStream::getSupportedServiceNames() { - return { "com.sun.star.io.DataInputStream" }; + return { u"com.sun.star.io.DataInputStream"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* @@ -682,7 +682,7 @@ Reference < XConnectable > ODataOutputStream::getPredecessor() // XServiceInfo OUString ODataOutputStream::getImplementationName() { - return "com.sun.star.comp.io.stm.DataOutputStream"; + return u"com.sun.star.comp.io.stm.DataOutputStream"_ustr; } // XServiceInfo @@ -694,7 +694,7 @@ sal_Bool ODataOutputStream::supportsService(const OUString& ServiceName) // XServiceInfo Sequence< OUString > ODataOutputStream::getSupportedServiceNames() { - return { "com.sun.star.io.DataOutputStream" }; + return { u"com.sun.star.io.DataOutputStream"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* @@ -942,7 +942,7 @@ sal_Int32 OObjectOutputStream::offsetToMark(sal_Int32 nMark) // XServiceInfo OUString OObjectOutputStream::getImplementationName() { - return "com.sun.star.comp.io.stm.ObjectOutputStream"; + return u"com.sun.star.comp.io.stm.ObjectOutputStream"_ustr; } // XServiceInfo @@ -954,7 +954,7 @@ sal_Bool OObjectOutputStream::supportsService(const OUString& ServiceName) // XServiceInfo Sequence< OUString > OObjectOutputStream::getSupportedServiceNames() { - return { "com.sun.star.io.ObjectOutputStream" }; + return { u"com.sun.star.io.ObjectOutputStream"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* @@ -1200,7 +1200,7 @@ sal_Int32 OObjectInputStream::offsetToMark(sal_Int32 nMark) // XServiceInfo OUString OObjectInputStream::getImplementationName() { - return "com.sun.star.comp.io.stm.ObjectInputStream"; + return u"com.sun.star.comp.io.stm.ObjectInputStream"_ustr; } // XServiceInfo @@ -1212,7 +1212,7 @@ sal_Bool OObjectInputStream::supportsService(const OUString& ServiceName) // XServiceInfo Sequence< OUString > OObjectInputStream::getSupportedServiceNames() { - return { "com.sun.star.io.ObjectInputStream" }; + return { u"com.sun.star.io.ObjectInputStream"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 9cc5959f1f13..8cac97e230bd 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -342,7 +342,7 @@ void OMarkableOutputStream::checkMarksAndFlush() // XServiceInfo OUString OMarkableOutputStream::getImplementationName() { - return "com.sun.star.comp.io.stm.MarkableOutputStream"; + return u"com.sun.star.comp.io.stm.MarkableOutputStream"_ustr; } // XServiceInfo @@ -354,7 +354,7 @@ sal_Bool OMarkableOutputStream::supportsService(const OUString& ServiceName) // XServiceInfo Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames() { - return { "com.sun.star.io.MarkableOutputStream" }; + return { u"com.sun.star.io.MarkableOutputStream"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* @@ -449,7 +449,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 if( !m_bValidStream ) { throw NotConnectedException( - "MarkableInputStream::readBytes NotConnectedException", + u"MarkableInputStream::readBytes NotConnectedException"_ustr, *this ); } std::unique_lock guard( m_mutex ); @@ -493,7 +493,7 @@ sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_I sal_Int32 nBytesRead; if( !m_bValidStream ) { throw NotConnectedException( - "MarkableInputStream::readSomeBytes NotConnectedException", + u"MarkableInputStream::readSomeBytes NotConnectedException"_ustr, *this ); } @@ -540,7 +540,7 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip) { if ( nBytesToSkip < 0 ) throw BufferSizeExceededException( - "precondition not met: XInputStream::skipBytes: non-negative integer required!", + u"precondition not met: XInputStream::skipBytes: non-negative integer required!"_ustr, *this ); @@ -553,7 +553,7 @@ sal_Int32 OMarkableInputStream::available() { if( !m_bValidStream ) { throw NotConnectedException( - "MarkableInputStream::available NotConnectedException", + u"MarkableInputStream::available NotConnectedException"_ustr, *this ); } @@ -567,7 +567,7 @@ void OMarkableInputStream::closeInput() { if( !m_bValidStream ) { throw NotConnectedException( - "MarkableInputStream::closeInput NotConnectedException", + u"MarkableInputStream::closeInput NotConnectedException"_ustr, *this ); } std::unique_lock guard( m_mutex ); @@ -737,7 +737,7 @@ void OMarkableInputStream::checkMarksAndFlush() // XServiceInfo OUString OMarkableInputStream::getImplementationName() { - return "com.sun.star.comp.io.stm.MarkableInputStream"; + return u"com.sun.star.comp.io.stm.MarkableInputStream"_ustr; } // XServiceInfo @@ -749,7 +749,7 @@ sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) // XServiceInfo Sequence< OUString > OMarkableInputStream::getSupportedServiceNames() { - return { "com.sun.star.io.MarkableInputStream" }; + return { u"com.sun.star.io.MarkableInputStream"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index 22e6218f3ef9..5c0e672dff1e 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -118,7 +118,7 @@ sal_Int32 OPipeImpl::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRe if( m_bInputStreamClosed ) { throw NotConnectedException( - "Pipe::readBytes NotConnectedException", + u"Pipe::readBytes NotConnectedException"_ustr, *this ); } sal_Int32 nOccupiedBufferLen = m_oFIFO->getSize(); @@ -154,7 +154,7 @@ sal_Int32 OPipeImpl::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBy if( m_bInputStreamClosed ) { throw NotConnectedException( - "Pipe::readSomeBytes NotConnectedException", + u"Pipe::readSomeBytes NotConnectedException"_ustr, *this ); } if( m_oFIFO->getSize() ) @@ -183,7 +183,7 @@ void OPipeImpl::skipBytes(sal_Int32 nBytesToSkip) if( m_bInputStreamClosed ) { throw NotConnectedException( - "Pipe::skipBytes NotConnectedException", + u"Pipe::skipBytes NotConnectedException"_ustr, *this ); } @@ -192,7 +192,7 @@ void OPipeImpl::skipBytes(sal_Int32 nBytesToSkip) > std::numeric_limits< sal_Int32 >::max() - m_nBytesToSkip) ) { throw BufferSizeExceededException( - "Pipe::skipBytes BufferSizeExceededException", + u"Pipe::skipBytes BufferSizeExceededException"_ustr, *this ); } m_nBytesToSkip += nBytesToSkip; @@ -209,7 +209,7 @@ sal_Int32 OPipeImpl::available() if( m_bInputStreamClosed ) { throw NotConnectedException( - "Pipe::available NotConnectedException", + u"Pipe::available NotConnectedException"_ustr, *this ); } return m_oFIFO->getSize(); @@ -237,14 +237,14 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData) if( m_bOutputStreamClosed ) { throw NotConnectedException( - "Pipe::writeBytes NotConnectedException (outputstream)", + u"Pipe::writeBytes NotConnectedException (outputstream)"_ustr, *this ); } if( m_bInputStreamClosed ) { throw NotConnectedException( - "Pipe::writeBytes NotConnectedException (inputstream)", + u"Pipe::writeBytes NotConnectedException (inputstream)"_ustr, *this ); } @@ -331,7 +331,7 @@ Reference < XConnectable > OPipeImpl::getPredecessor() // XServiceInfo OUString OPipeImpl::getImplementationName() { - return "com.sun.star.comp.io.stm.Pipe"; + return u"com.sun.star.comp.io.stm.Pipe"_ustr; } // XServiceInfo @@ -343,7 +343,7 @@ sal_Bool OPipeImpl::supportsService(const OUString& ServiceName) // XServiceInfo Sequence< OUString > OPipeImpl::getSupportedServiceNames() { - return { "com.sun.star.io.Pipe" }; + return { u"com.sun.star.io.Pipe"_ustr }; } } diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 62f6e85c3b95..febd86b26333 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -262,14 +262,14 @@ void Pump::run() if( ! rInput.is() ) { - throw NotConnectedException( "no input stream set", getXWeak() ); + throw NotConnectedException( u"no input stream set"_ustr, getXWeak() ); } Sequence< sal_Int8 > aData; while( rInput->readSomeBytes( aData, 65536 ) ) { if( ! rOutput.is() ) { - throw NotConnectedException( "no output stream set", getXWeak() ); + throw NotConnectedException( u"no output stream set"_ustr, getXWeak() ); } rOutput->writeBytes( aData ); osl_yieldThread(); @@ -357,7 +357,7 @@ void Pump::start() if( !m_aThread ) { throw RuntimeException( - "Pump::start Couldn't create worker thread", + u"Pump::start Couldn't create worker thread"_ustr, *this); } @@ -426,7 +426,7 @@ Reference< XOutputStream > Pump::getOutputStream() // XServiceInfo OUString Pump::getImplementationName() { - return "com.sun.star.comp.io.Pump"; + return u"com.sun.star.comp.io.Pump"_ustr; } // XServiceInfo @@ -438,7 +438,7 @@ sal_Bool Pump::supportsService(const OUString& ServiceName) // XServiceInfo Sequence< OUString > Pump::getSupportedServiceNames() { - return { "com.sun.star.io.Pump" }; + return { u"com.sun.star.io.Pump"_ustr }; } } diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx index 0933ac966f8f..c682ecaad513 100644 --- a/io/source/stm/streamhelper.cxx +++ b/io/source/stm/streamhelper.cxx @@ -74,7 +74,7 @@ void MemRingBuffer::resizeBuffer( sal_Int32 nMinSize ) auto p = static_cast<sal_Int8*>(std::realloc(m_p, nNewLen)); if (!p) throw css::io::BufferSizeExceededException( - "MemRingBuffer::resizeBuffer BufferSizeExceededException"); + u"MemRingBuffer::resizeBuffer BufferSizeExceededException"_ustr); m_p = p; @@ -91,7 +91,7 @@ void MemRingBuffer::readAt( sal_Int32 nPos, Sequence<sal_Int8> &seq , sal_Int32 { if( nPos + nBytesToRead > m_nOccupiedBuffer ) { throw css::io::BufferSizeExceededException( - "MemRingBuffer::readAt BufferSizeExceededException"); + u"MemRingBuffer::readAt BufferSizeExceededException"_ustr); } sal_Int32 nStartReadingPos = nPos + m_nStart; @@ -120,7 +120,7 @@ void MemRingBuffer::writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &seq ) if( nPos < 0 || nPos > std::numeric_limits< sal_Int32 >::max() - nLen ) { throw css::io::BufferSizeExceededException( - "MemRingBuffer::writeAt BufferSizeExceededException"); + u"MemRingBuffer::writeAt BufferSizeExceededException"_ustr); } if( nPos + nLen - m_nOccupiedBuffer > 0 ) { @@ -157,7 +157,7 @@ void MemRingBuffer::forgetFromStart( sal_Int32 nBytesToForget ) checkInvariants(); if( nBytesToForget > m_nOccupiedBuffer ) { throw css::io::BufferSizeExceededException( - "MemRingBuffer::forgetFromStart BufferSizeExceededException"); + u"MemRingBuffer::forgetFromStart BufferSizeExceededException"_ustr); } m_nStart += nBytesToForget; if( m_nStart >= m_nBufferLen ) { |