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& operator << ( - const css::uno::Reference& _rxOutStream, +const css::uno::Reference& operator << ( + const css::uno::Reference& _rxOutStream, const css::awt::FontDescriptor& _rFont) { _rxOutStream->writeUTF( _rFont.Name ); @@ -50,8 +50,8 @@ const css::uno::Reference& operator << ( // FontDescriptor -const css::uno::Reference& operator >> ( - const css::uno::Reference& _rxInStream, +const css::uno::Reference& operator >> ( + const css::uno::Reference& _rxInStream, css::awt::FontDescriptor& _rFont) { // schreiben des Fontdescriptors @@ -75,84 +75,84 @@ const css::uno::Reference& operator >> ( } -const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, bool& _rVal) +const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, bool& _rVal) { _rVal = _rxInStream->readBoolean(); return _rxInStream; } -const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, bool _bVal) +const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, bool _bVal) { _rxOutStream->writeBoolean(_bVal); return _rxOutStream; } -const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, OUString& rStr) +const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, OUString& rStr) { rStr = _rxInStream->readUTF(); return _rxInStream; } -const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, const OUString& rStr) +const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, const OUString& rStr) { _rxOutStream->writeUTF(rStr); return _rxOutStream; } -const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_Int16& _rValue) +const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_Int16& _rValue) { _rValue = _rxInStream->readShort(); return _rxInStream; } -const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_Int16 _nValue) +const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_Int16 _nValue) { _rxOutStream->writeShort(_nValue); return _rxOutStream; } -const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_uInt16& _rValue) +const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_uInt16& _rValue) { _rValue = _rxInStream->readShort(); return _rxInStream; } -const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_uInt16 _nValue) +const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_uInt16 _nValue) { _rxOutStream->writeShort(_nValue); return _rxOutStream; } -const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_uInt32& _rValue) +const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_uInt32& _rValue) { _rValue = _rxInStream->readLong(); return _rxInStream; } -const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_uInt32 _nValue) +const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_uInt32 _nValue) { _rxOutStream->writeLong(_nValue); return _rxOutStream; } -const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_Int32& _rValue) +const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_Int32& _rValue) { _rValue = _rxInStream->readLong(); return _rxInStream; } -const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_Int32 _nValue) +const css::uno::Reference& operator << (const css::uno::Reference& _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(this)); + throw css::io::NotConnectedException(OUString(), static_cast(this)); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(OUString(),static_cast(this)); + throw css::io::BufferSizeExceededException(OUString(),static_cast(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(this)); + throw css::io::BufferSizeExceededException(OUString(),static_cast(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(this)); + throw css::io::NotConnectedException(OUString(), static_cast(this)); if (nMaxBytesToRead < 0) - throw stario::BufferSizeExceededException(OUString(),static_cast(this)); + throw css::io::BufferSizeExceededException(OUString(),static_cast(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(this)); + throw css::io::NotConnectedException(OUString(), static_cast(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(this)); + throw css::io::NotConnectedException(OUString(), static_cast(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(this)); + throw css::io::NotConnectedException(OUString(), static_cast(this)); sal_uInt64 nPos; FileBase::RC eError = m_pFile->getPos(nPos); if (eError != FileBase::E_None) - throw stario::NotConnectedException(OUString(), static_cast(this)); + throw css::io::NotConnectedException(OUString(), static_cast(this)); sal_uInt64 nDummy = 0; eError = m_pFile->setPos(osl_Pos_End, nDummy); if (eError != FileBase::E_None) - throw stario::NotConnectedException(OUString(),static_cast(this)); + throw css::io::NotConnectedException(OUString(),static_cast(this)); sal_uInt64 nAvailable; eError = m_pFile->getPos(nAvailable); if (eError != FileBase::E_None) - throw stario::NotConnectedException(OUString(),static_cast(this)); + throw css::io::NotConnectedException(OUString(),static_cast(this)); nAvailable = nAvailable - nPos; eError = m_pFile->setPos(osl_Pos_Absolut, nPos); if (eError != FileBase::E_None) - throw stario::NotConnectedException(OUString(),static_cast(this)); + throw css::io::NotConnectedException(OUString(),static_cast(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(this)); + throw css::io::NotConnectedException(OUString(), static_cast(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(this)); + throw css::io::BufferSizeExceededException(OUString(),static_cast(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) diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx index 525daf6370ae..c48a313dacc4 100644 --- a/include/comphelper/basicio.hxx +++ b/include/comphelper/basicio.hxx @@ -28,43 +28,40 @@ namespace comphelper { - -namespace stario = ::com::sun::star::io; - // bool -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, bool& _rVal); -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, bool _bVal); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, bool& _rVal); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, bool _bVal); void operator <<( css::uno::Reference const &, sal_Bool) SAL_DELETED_FUNCTION; // OUString -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, OUString& _rStr); -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, const OUString& _rStr); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, OUString& _rStr); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, const OUString& _rStr); // sal_Int16 -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_Int16& _rValue); -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_Int16 _nValue); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_Int16& _rValue); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_Int16 _nValue); // sal_uInt16 -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_uInt16& _rValue); -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_uInt16 _nValue); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_uInt16& _rValue); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_uInt16 _nValue); // sal_uInt32 -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_uInt32& _rValue); -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_uInt32 _nValue); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_uInt32& _rValue); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_uInt32 _nValue); // sal_Int16 -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_Int32& _rValue); -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_Int32 _nValue); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, sal_Int32& _rValue); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, sal_Int32 _nValue); // FontDescriptor -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& InStream, css::awt::FontDescriptor& rVal); -COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& OutStream, const css::awt::FontDescriptor& rVal); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator >> (const css::uno::Reference& InStream, css::awt::FontDescriptor& rVal); +COMPHELPER_DLLPUBLIC const css::uno::Reference& operator << (const css::uno::Reference& OutStream, const css::awt::FontDescriptor& rVal); // sequences template -const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, css::uno::Sequence& _rSeq) +const css::uno::Reference& operator >> (const css::uno::Reference& _rxInStream, css::uno::Sequence& _rSeq) { sal_Int32 nLen = _rxInStream->readLong(); _rSeq.realloc(nLen); @@ -78,7 +75,7 @@ const css::uno::Reference& operator >> (const css::u } template -const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, const css::uno::Sequence& _rSeq) +const css::uno::Reference& operator << (const css::uno::Reference& _rxOutStream, const css::uno::Sequence& _rSeq) { sal_Int32 nLen = _rSeq.getLength(); _rxOutStream->writeLong(nLen); diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx index 230c88b385ea..9753aeccd788 100644 --- a/include/comphelper/oslfile2streamwrap.hxx +++ b/include/comphelper/oslfile2streamwrap.hxx @@ -28,12 +28,11 @@ namespace comphelper { - namespace stario = ::com::sun::star::io; // FmUnoIOStream, // Stream to read and write data, based on File -class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper1 +class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper1 { ::osl::Mutex m_aMutex; ::osl::File* m_pFile; @@ -42,19 +41,19 @@ public: OSLInputStreamWrapper(::osl::File& _rStream); virtual ~OSLInputStreamWrapper(); -// stario::XInputStream - virtual sal_Int32 SAL_CALL readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available() throw(stario::NotConnectedException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::io::XInputStream + virtual sal_Int32 SAL_CALL readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL available() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeInput() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; // FmUnoOutStream, // data sink for the files -class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1 +class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1 { public: COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper(::osl::File& _rFile); @@ -62,10 +61,10 @@ public: private: virtual ~OSLOutputStreamWrapper(); -// stario::XOutputStream - virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::io::XOutputStream + virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::osl::File& rFile; }; diff --git a/include/comphelper/streamsection.hxx b/include/comphelper/streamsection.hxx index 72545d0ec681..44da3d51b20a 100644 --- a/include/comphelper/streamsection.hxx +++ b/include/comphelper/streamsection.hxx @@ -28,8 +28,6 @@ namespace comphelper { - namespace stario = ::com::sun::star::io; - /** implements handling for compatibly reading/writing data from/into an input/output stream. data written in a block secured by this class should be readable by older versions which use the same mechanism. @@ -40,9 +38,9 @@ namespace comphelper class COMPHELPER_DLLPUBLIC OStreamSection { - css::uno::Reference< stario::XMarkableStream > m_xMarkStream; - css::uno::Reference< stario::XDataInputStream > m_xInStream; - css::uno::Reference< stario::XDataOutputStream > m_xOutStream; + css::uno::Reference< css::io::XMarkableStream > m_xMarkStream; + css::uno::Reference< css::io::XDataInputStream > m_xInStream; + css::uno::Reference< css::io::XDataOutputStream > m_xOutStream; sal_Int32 m_nBlockStart; sal_Int32 m_nBlockLen; @@ -52,7 +50,7 @@ public: @param _rxInput the stream to read from. Must support the com::sun::star::io::XMarkableStream interface */ - OStreamSection(const css::uno::Reference< stario::XDataInputStream >& _rxInput); + OStreamSection(const css::uno::Reference< css::io::XDataInputStream >& _rxInput); /** starts writing of a "skippable" section of data into the given output stream @param _rxOutput the stream the stream to write to. Must support the @@ -62,7 +60,7 @@ public: needed. If you know how much bytes you are about to write, you may want to use this param, saving some stream operations this way. */ - OStreamSection(const css::uno::Reference< stario::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength = 0); + OStreamSection(const css::uno::Reference< css::io::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength = 0); /** dtor.
If constructed for writing, the section "opened" by this object will be "closed".
If constructed for reading, any remaining bytes 'til the end of the section will be skipped.