diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-20 21:45:18 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-21 09:03:23 +0200 |
commit | cb347ddc5c7fc5a7e66c342d4e7a5a15f274fc21 (patch) | |
tree | 59ce0a0a27bae2bb7e8b7cc4e30bfeac600f5bc0 /comphelper | |
parent | edda7dbad7e03487b75a79455a7d48198046cbfc (diff) |
stario -> css::io
Change-Id: Iad96e0a2bfd6c126c696f14919dbfd8e072dd230
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/source/streaming/basicio.cxx | 32 | ||||
-rw-r--r-- | comphelper/source/streaming/oslfile2streamwrap.cxx | 46 | ||||
-rw-r--r-- | comphelper/source/streaming/streamsection.cxx | 4 |
3 files changed, 41 insertions, 41 deletions
diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx index 0680af68ca04..e1413f4b0450 100644 --- a/comphelper/source/streaming/basicio.cxx +++ b/comphelper/source/streaming/basicio.cxx @@ -25,8 +25,8 @@ namespace comphelper -const css::uno::Reference<stario::XObjectOutputStream>& operator << ( - const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, +const css::uno::Reference<css::io::XObjectOutputStream>& operator << ( + const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, const css::awt::FontDescriptor& _rFont) { _rxOutStream->writeUTF( _rFont.Name ); @@ -50,8 +50,8 @@ const css::uno::Reference<stario::XObjectOutputStream>& operator << ( // FontDescriptor -const css::uno::Reference<stario::XObjectInputStream>& operator >> ( - const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, +const css::uno::Reference<css::io::XObjectInputStream>& operator >> ( + const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, css::awt::FontDescriptor& _rFont) { // schreiben des Fontdescriptors @@ -75,84 +75,84 @@ const css::uno::Reference<stario::XObjectInputStream>& operator >> ( } -const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, bool& _rVal) +const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, bool& _rVal) { _rVal = _rxInStream->readBoolean(); return _rxInStream; } -const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, bool _bVal) +const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, bool _bVal) { _rxOutStream->writeBoolean(_bVal); return _rxOutStream; } -const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& rStr) +const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, OUString& rStr) { rStr = _rxInStream->readUTF(); return _rxInStream; } -const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& rStr) +const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, const OUString& rStr) { _rxOutStream->writeUTF(rStr); return _rxOutStream; } -const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int16& _rValue) +const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_Int16& _rValue) { _rValue = _rxInStream->readShort(); return _rxInStream; } -const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int16 _nValue) +const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_Int16 _nValue) { _rxOutStream->writeShort(_nValue); return _rxOutStream; } -const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt16& _rValue) +const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_uInt16& _rValue) { _rValue = _rxInStream->readShort(); return _rxInStream; } -const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt16 _nValue) +const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_uInt16 _nValue) { _rxOutStream->writeShort(_nValue); return _rxOutStream; } -const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt32& _rValue) +const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_uInt32& _rValue) { _rValue = _rxInStream->readLong(); return _rxInStream; } -const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt32 _nValue) +const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_uInt32 _nValue) { _rxOutStream->writeLong(_nValue); return _rxOutStream; } -const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int32& _rValue) +const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_Int32& _rValue) { _rValue = _rxInStream->readLong(); return _rxInStream; } -const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue) +const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue) { _rxOutStream->writeLong(_nValue); return _rxOutStream; diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index 1c8584ef79ab..4b9aad443b6c 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.cxx @@ -38,13 +38,13 @@ OSLInputStreamWrapper::~OSLInputStreamWrapper() sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) + throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { if (!m_pFile) - throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); + throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); + throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); ::osl::MutexGuard aGuard( m_aMutex ); @@ -53,7 +53,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 sal_uInt64 nRead = 0; FileBase::RC eError = m_pFile->read((void*)aData.getArray(), nBytesToRead, nRead); if (eError != FileBase::E_None) - throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); + throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); // Wenn gelesene Zeichen < MaxLength, css::uno::Sequence anpassen if (nRead < (sal_uInt32)nBytesToRead) @@ -63,23 +63,23 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 } -sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { if (!m_pFile) - throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); + throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); if (nMaxBytesToRead < 0) - throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); + throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); return readBytes(aData, nMaxBytesToRead); } -void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) - throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); + throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); sal_uInt64 nCurrentPos; m_pFile->getPos(nCurrentPos); @@ -88,45 +88,45 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st FileBase::RC eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos); if (eError != FileBase::E_None) { - throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); + throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); } } -sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnectedException, css::uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) - throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); + throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); sal_uInt64 nPos; FileBase::RC eError = m_pFile->getPos(nPos); if (eError != FileBase::E_None) - throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); + throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); sal_uInt64 nDummy = 0; eError = m_pFile->setPos(osl_Pos_End, nDummy); if (eError != FileBase::E_None) - throw stario::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this)); + throw css::io::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this)); sal_uInt64 nAvailable; eError = m_pFile->getPos(nAvailable); if (eError != FileBase::E_None) - throw stario::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this)); + throw css::io::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this)); nAvailable = nAvailable - nPos; eError = m_pFile->setPos(osl_Pos_Absolut, nPos); if (eError != FileBase::E_None) - throw stario::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this)); + throw css::io::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this)); return sal::static_int_cast< sal_Int32 >( std::max(nAvailable, sal::static_int_cast< sal_uInt64 >(SAL_MAX_INT32))); } -void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLInputStreamWrapper::closeInput() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception ) { if (!m_pFile) - throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); + throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); m_pFile->close(); @@ -134,7 +134,7 @@ void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedExc } /*************************************************************************/ -// stario::XOutputStream +// css::io::XOutputStream OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile): @@ -143,24 +143,24 @@ OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile): OSLOutputStreamWrapper::~OSLOutputStreamWrapper() {} -void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { sal_uInt64 nWritten; FileBase::RC eError = rFile.write(aData.getConstArray(),aData.getLength(), nWritten); if (eError != FileBase::E_None || nWritten != sal::static_int_cast< sal_uInt32 >(aData.getLength())) { - throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); + throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); } } -void SAL_CALL OSLOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLOutputStreamWrapper::flush() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { } -void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { rFile.close(); } diff --git a/comphelper/source/streaming/streamsection.cxx b/comphelper/source/streaming/streamsection.cxx index c1b2408ddca1..ea3955b0264b 100644 --- a/comphelper/source/streaming/streamsection.cxx +++ b/comphelper/source/streaming/streamsection.cxx @@ -24,7 +24,7 @@ namespace comphelper { -OStreamSection::OStreamSection(const css::uno::Reference< stario::XDataInputStream >& _rxInput) +OStreamSection::OStreamSection(const css::uno::Reference< css::io::XDataInputStream >& _rxInput) :m_xMarkStream(_rxInput, ::com::sun::star::uno::UNO_QUERY) ,m_xInStream(_rxInput) ,m_nBlockStart(-1) @@ -39,7 +39,7 @@ OStreamSection::OStreamSection(const css::uno::Reference< stario::XDataInputStre } -OStreamSection::OStreamSection(const css::uno::Reference< stario::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength) +OStreamSection::OStreamSection(const css::uno::Reference< css::io::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength) :m_xMarkStream(_rxOutput, ::com::sun::star::uno::UNO_QUERY) ,m_xOutStream(_rxOutput) ,m_nBlockStart(-1) |