From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Sun, 7 Apr 2013 12:06:47 +0200 Subject: mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09 --- unotools/source/streaming/streamhelper.cxx | 14 +++++++------- unotools/source/streaming/streamwrap.cxx | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'unotools/source/streaming') diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx index 3729c2c827c7..da0a198565b1 100644 --- a/unotools/source/streaming/streamhelper.cxx +++ b/unotools/source/streaming/streamhelper.cxx @@ -39,10 +39,10 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException) { if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(), static_cast(this)); + throw stario::BufferSizeExceededException(OUString(), static_cast(this)); ::osl::MutexGuard aGuard( m_aMutex ); aData.realloc(nBytesToRead); @@ -53,7 +53,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& m_nActPos += (sal_uInt32)nRead; if (nError != ERRCODE_NONE) - throw stario::IOException(::rtl::OUString(), static_cast(this)); + throw stario::IOException(OUString(), static_cast(this)); // adjust sequence if data read is lower than the desired data if (nRead < (sal_uInt32)nBytesToRead) @@ -101,10 +101,10 @@ void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); if (nBytesToSkip < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(), static_cast(this)); + throw stario::BufferSizeExceededException(OUString(), static_cast(this)); m_nActPos += nBytesToSkip; } @@ -115,7 +115,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::available() { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); return m_nAvailable; } @@ -126,7 +126,7 @@ void SAL_CALL OInputStreamHelper::closeInput() { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); m_xLockBytes = NULL; } diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx index 0ae42190a7f6..4798af6d825f 100644 --- a/unotools/source/streaming/streamwrap.cxx +++ b/unotools/source/streaming/streamwrap.cxx @@ -66,7 +66,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& checkConnected(); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); ::osl::MutexGuard aGuard( m_aMutex ); @@ -88,7 +88,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int checkError(); if (nMaxBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); if (m_pSvStream->IsEof()) { @@ -144,7 +144,7 @@ void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedExcep void OInputStreamWrapper::checkConnected() const { if (!m_pSvStream) - throw stario::NotConnectedException(::rtl::OUString(), const_cast(static_cast(this))); + throw stario::NotConnectedException(OUString(), const_cast(static_cast(this))); } //------------------------------------------------------------------------------ @@ -154,7 +154,7 @@ void OInputStreamWrapper::checkError() const if (m_pSvStream->SvStream::GetError() != ERRCODE_NONE) // TODO: really evaluate the error - throw stario::NotConnectedException(::rtl::OUString(), const_cast(static_cast(this))); + throw stario::NotConnectedException(OUString(), const_cast(static_cast(this))); } //================================================================== @@ -229,7 +229,7 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 || (nWritten != (sal_uInt32)aData.getLength()) ) { - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); } } @@ -250,7 +250,7 @@ void OOutputStreamWrapper::checkError() const { if (rStream.GetError() != ERRCODE_NONE) // TODO: really evaluate the error - throw stario::NotConnectedException(::rtl::OUString(), const_cast(static_cast(this))); + throw stario::NotConnectedException(OUString(), const_cast(static_cast(this))); } //================================================================== @@ -342,7 +342,7 @@ void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aD || (nWritten != (sal_uInt32)aData.getLength()) ) { - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); } } @@ -351,7 +351,7 @@ void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stari { m_pSvStream->Flush(); if (m_pSvStream->GetError() != ERRCODE_NONE) - throw stario::NotConnectedException(::rtl::OUString(),static_cast(this)); + throw stario::NotConnectedException(OUString(),static_cast(this)); } //------------------------------------------------------------------------------ -- cgit