diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-20 14:39:24 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-21 09:03:14 +0200 |
commit | 091fc82b82ef861953c2a9def386ac2f80040a3b (patch) | |
tree | 6cc35d4f51a02c1784deadc7607dccfe23c4bcdb /unotools/source/streaming | |
parent | e189fa400ec4fcafae5e3b04f054cec851f81dd8 (diff) |
unotools: staruno -> css::uno
Change-Id: I20a470fe654bfd1eec23dd2e0c13162a0b432a32
Diffstat (limited to 'unotools/source/streaming')
-rw-r--r-- | unotools/source/streaming/streamhelper.cxx | 28 | ||||
-rw-r--r-- | unotools/source/streaming/streamwrap.cxx | 42 |
2 files changed, 35 insertions, 35 deletions
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx index b7745491a814..f36295a821cf 100644 --- a/unotools/source/streaming/streamhelper.cxx +++ b/unotools/source/streaming/streamhelper.cxx @@ -32,14 +32,14 @@ void SAL_CALL OInputStreamHelper::release() throw () InputStreamHelper_Base::release(); } -sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OInputStreamHelper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) + throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, css::uno::RuntimeException, std::exception) { if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(), static_cast<css::uno::XWeak*>(this)); ::osl::MutexGuard aGuard( m_aMutex ); aData.realloc(nBytesToRead); @@ -49,7 +49,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& m_nActPos += nRead; if (nError != ERRCODE_NONE) - throw stario::IOException(OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::IOException(OUString(), static_cast<css::uno::XWeak*>(this)); // adjust sequence if data read is lower than the desired data if (nRead < (sal_uInt32)nBytesToRead) @@ -80,43 +80,43 @@ sal_Int64 SAL_CALL OInputStreamHelper::getLength( ) throw(::com::sun::star::io: return aStat.nSize; } -sal_Int32 SAL_CALL OInputStreamHelper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, +sal_Int32 SAL_CALL OInputStreamHelper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) - throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) + throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, css::uno::RuntimeException, std::exception) { // read all data desired return readBytes(aData, nMaxBytesToRead); } void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip) - throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) + throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); if (nBytesToSkip < 0) - throw stario::BufferSizeExceededException(OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(), static_cast<css::uno::XWeak*>(this)); m_nActPos += nBytesToSkip; } sal_Int32 SAL_CALL OInputStreamHelper::available() - throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception) + throw (stario::NotConnectedException, stario::IOException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); return m_nAvailable; } void SAL_CALL OInputStreamHelper::closeInput() - throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception) + throw (stario::NotConnectedException, stario::IOException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); m_xLockBytes = NULL; } diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx index 357bce58ec1e..c63d6cdae8d8 100644 --- a/unotools/source/streaming/streamwrap.cxx +++ b/unotools/source/streaming/streamwrap.cxx @@ -45,13 +45,13 @@ OInputStreamWrapper::~OInputStreamWrapper() delete m_pSvStream; } -sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) + throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { checkConnected(); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); ::osl::MutexGuard aGuard( m_aMutex ); @@ -60,19 +60,19 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& sal_uInt32 nRead = m_pSvStream->Read((void*)aData.getArray(), nBytesToRead); checkError(); - // Wenn gelesene Zeichen < MaxLength, staruno::Sequence anpassen + // Wenn gelesene Zeichen < MaxLength, css::uno::Sequence anpassen if (nRead < (sal_uInt32)nBytesToRead) aData.realloc( nRead ); return nRead; } -sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { checkError(); if (nMaxBytesToRead < 0) - throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); if (m_pSvStream->IsEof()) { @@ -83,7 +83,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int return readBytes(aData, nMaxBytesToRead); } -void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) +void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); checkError(); @@ -92,7 +92,7 @@ void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( star checkError(); } -sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedException, staruno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedException, css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); checkConnected(); @@ -110,7 +110,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedE return nAvailable; } -void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException, std::exception ) +void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedException, css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); checkConnected(); @@ -124,7 +124,7 @@ void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedExcep void OInputStreamWrapper::checkConnected() const { if (!m_pSvStream) - throw stario::NotConnectedException(OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); + throw stario::NotConnectedException(OUString(), const_cast<css::uno::XWeak*>(static_cast<const css::uno::XWeak*>(this))); } void OInputStreamWrapper::checkError() const @@ -133,7 +133,7 @@ void OInputStreamWrapper::checkError() const if (m_pSvStream->SvStream::GetError() != ERRCODE_NONE) // TODO: really evaluate the error - throw stario::NotConnectedException(OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); + throw stario::NotConnectedException(OUString(), const_cast<css::uno::XWeak*>(static_cast<const css::uno::XWeak*>(this))); } //= OSeekableInputStreamWrapper @@ -192,7 +192,7 @@ OOutputStreamWrapper::OOutputStreamWrapper(SvStream& _rStream): OOutputStreamWrapper::~OOutputStreamWrapper() {} -void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) +void SAL_CALL OOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { sal_uInt32 nWritten = rStream.Write(aData.getConstArray(),aData.getLength()); ErrCode err = rStream.GetError(); @@ -200,17 +200,17 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 || (nWritten != (sal_uInt32)aData.getLength()) ) { - throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); } } -void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) +void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { rStream.Flush(); checkError(); } -void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) +void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { } @@ -218,7 +218,7 @@ void OOutputStreamWrapper::checkError() const { if (rStream.GetError() != ERRCODE_NONE) // TODO: really evaluate the error - throw stario::NotConnectedException(OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); + throw stario::NotConnectedException(OUString(), const_cast<css::uno::XWeak*>(static_cast<const css::uno::XWeak*>(this))); } //= OSeekableOutputStreamWrapper @@ -290,7 +290,7 @@ OStreamWrapper::OStreamWrapper(SvStream& _rStream) return this; } -void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) +void SAL_CALL OStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) { sal_uInt32 nWritten = m_pSvStream->Write(aData.getConstArray(),aData.getLength()); ErrCode err = m_pSvStream->GetError(); @@ -298,18 +298,18 @@ void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aD || (nWritten != (sal_uInt32)aData.getLength()) ) { - throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); } } -void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) +void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) { m_pSvStream->Flush(); if (m_pSvStream->GetError() != ERRCODE_NONE) - throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this)); } -void SAL_CALL OStreamWrapper::closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) +void SAL_CALL OStreamWrapper::closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) { } |