mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stario -> css::io

Browse Source 
Change-Id: Iad96e0a2bfd6c126c696f14919dbfd8e072dd230
This commit is contained in:
Thomas Arnhold
2014-08-20 21:45:18 +02:00
parent edda7dbad7
commit cb347ddc5c
6 changed files with 74 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
comphelper/source/streaming/basicio.cxx
View File

@@ -25,8 +25,8 @@ namespace comphelper
const css::uno::Reference<stario::XObjectOutputStream>& operator << ( const css::uno::Reference<css::io::XObjectOutputStream>& operator << (
const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream,
const css::awt::FontDescriptor& _rFont) const css::awt::FontDescriptor& _rFont)
{ {
_rxOutStream->writeUTF( _rFont.Name ); _rxOutStream->writeUTF( _rFont.Name );
@@ -50,8 +50,8 @@ const css::uno::Reference<stario::XObjectOutputStream>& operator << (
// FontDescriptor // FontDescriptor
const css::uno::Reference<stario::XObjectInputStream>& operator >> ( const css::uno::Reference<css::io::XObjectInputStream>& operator >> (
const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream,
css::awt::FontDescriptor& _rFont) css::awt::FontDescriptor& _rFont)
{ {
// schreiben des Fontdescriptors // 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(); _rVal = _rxInStream->readBoolean();
return _rxInStream; 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); _rxOutStream->writeBoolean(_bVal);
return _rxOutStream; 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(); rStr = _rxInStream->readUTF();
return _rxInStream; 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); _rxOutStream->writeUTF(rStr);
return _rxOutStream; 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(); _rValue = _rxInStream->readShort();
return _rxInStream; 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); _rxOutStream->writeShort(_nValue);
return _rxOutStream; 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(); _rValue = _rxInStream->readShort();
return _rxInStream; 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); _rxOutStream->writeShort(_nValue);
return _rxOutStream; 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(); _rValue = _rxInStream->readLong();
return _rxInStream; 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); _rxOutStream->writeLong(_nValue);
return _rxOutStream; 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(); _rValue = _rxInStream->readLong();
return _rxInStream; 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); _rxOutStream->writeLong(_nValue);
return _rxOutStream; return _rxOutStream;

46
comphelper/source/streaming/oslfile2streamwrap.cxx
View File

@@ -38,13 +38,13 @@ OSLInputStreamWrapper::~OSLInputStreamWrapper()
sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) 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) 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) 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 ); ::osl::MutexGuard aGuard( m_aMutex );
@@ -53,7 +53,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8
sal_uInt64 nRead = 0; sal_uInt64 nRead = 0;
FileBase::RC eError = m_pFile->read((void*)aData.getArray(), nBytesToRead, nRead); FileBase::RC eError = m_pFile->read((void*)aData.getArray(), nBytesToRead, nRead);
if (eError != FileBase::E_None) 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 // Wenn gelesene Zeichen < MaxLength, css::uno::Sequence anpassen
if (nRead < (sal_uInt32)nBytesToRead) 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) 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) 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); 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 ); ::osl::MutexGuard aGuard( m_aMutex );
if (!m_pFile) 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; sal_uInt64 nCurrentPos;
m_pFile->getPos(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); FileBase::RC eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos);
if (eError != FileBase::E_None) 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 ); ::osl::MutexGuard aGuard( m_aMutex );
if (!m_pFile) 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; sal_uInt64 nPos;
FileBase::RC eError = m_pFile->getPos(nPos); FileBase::RC eError = m_pFile->getPos(nPos);
if (eError != FileBase::E_None) 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; sal_uInt64 nDummy = 0;
eError = m_pFile->setPos(osl_Pos_End, nDummy); eError = m_pFile->setPos(osl_Pos_End, nDummy);
if (eError != FileBase::E_None) 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; sal_uInt64 nAvailable;
eError = m_pFile->getPos(nAvailable); eError = m_pFile->getPos(nAvailable);
if (eError != FileBase::E_None) 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; nAvailable = nAvailable - nPos;
eError = m_pFile->setPos(osl_Pos_Absolut, nPos); eError = m_pFile->setPos(osl_Pos_Absolut, nPos);
if (eError != FileBase::E_None) 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 >( return sal::static_int_cast< sal_Int32 >(
std::max(nAvailable, sal::static_int_cast< sal_uInt64 >(SAL_MAX_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) 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(); 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): OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile):
@@ -143,24 +143,24 @@ OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile):
OSLOutputStreamWrapper::~OSLOutputStreamWrapper() {} 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; sal_uInt64 nWritten;
FileBase::RC eError = rFile.write(aData.getConstArray(),aData.getLength(), nWritten); FileBase::RC eError = rFile.write(aData.getConstArray(),aData.getLength(), nWritten);
if (eError != FileBase::E_None if (eError != FileBase::E_None
|| nWritten != sal::static_int_cast< sal_uInt32 >(aData.getLength())) || 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(); rFile.close();
} }

4
comphelper/source/streaming/streamsection.cxx
View File

@@ -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_xMarkStream(_rxInput, ::com::sun::star::uno::UNO_QUERY)
,m_xInStream(_rxInput) ,m_xInStream(_rxInput)
,m_nBlockStart(-1) ,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_xMarkStream(_rxOutput, ::com::sun::star::uno::UNO_QUERY)
,m_xOutStream(_rxOutput) ,m_xOutStream(_rxOutput)
,m_nBlockStart(-1) ,m_nBlockStart(-1)

35
include/comphelper/basicio.hxx
View File

@@ -28,43 +28,40 @@
namespace comphelper namespace comphelper
{ {
namespace stario = ::com::sun::star::io;
// bool // bool
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, bool& _rVal); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, bool& _rVal);
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, bool _bVal); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, bool _bVal);
void operator <<( void operator <<(
css::uno::Reference<css::io::XObjectOutputStream> const &, sal_Bool) css::uno::Reference<css::io::XObjectOutputStream> const &, sal_Bool)
SAL_DELETED_FUNCTION; SAL_DELETED_FUNCTION;
// OUString // OUString
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& _rStr); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, OUString& _rStr);
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& _rStr); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, const OUString& _rStr);
// sal_Int16 // sal_Int16
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int16& _rValue); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_Int16& _rValue);
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int16 _nValue); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_Int16 _nValue);
// sal_uInt16 // sal_uInt16
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt16& _rValue); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_uInt16& _rValue);
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt16 _nValue); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_uInt16 _nValue);
// sal_uInt32 // sal_uInt32
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt32& _rValue); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_uInt32& _rValue);
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt32 _nValue); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_uInt32 _nValue);
// sal_Int16 // sal_Int16
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int32& _rValue); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_Int32& _rValue);
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue);
// FontDescriptor // FontDescriptor
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& InStream, css::awt::FontDescriptor& rVal); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& InStream, css::awt::FontDescriptor& rVal);
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& OutStream, const css::awt::FontDescriptor& rVal); COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& OutStream, const css::awt::FontDescriptor& rVal);
// sequences // sequences
template <class ELEMENT> template <class ELEMENT>
const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, css::uno::Sequence<ELEMENT>& _rSeq) const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, css::uno::Sequence<ELEMENT>& _rSeq)
{ {
sal_Int32 nLen = _rxInStream->readLong(); sal_Int32 nLen = _rxInStream->readLong();
_rSeq.realloc(nLen); _rSeq.realloc(nLen);
@@ -78,7 +75,7 @@ const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::u
} }
template <class ELEMENT> template <class ELEMENT>
const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, const css::uno::Sequence<ELEMENT>& _rSeq) const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, const css::uno::Sequence<ELEMENT>& _rSeq)
{ {
sal_Int32 nLen = _rSeq.getLength(); sal_Int32 nLen = _rSeq.getLength();
_rxOutStream->writeLong(nLen); _rxOutStream->writeLong(nLen);

25
include/comphelper/oslfile2streamwrap.hxx
View File

@@ -28,12 +28,11 @@
namespace comphelper namespace comphelper
{ {
namespace stario = ::com::sun::star::io;
// FmUnoIOStream, // FmUnoIOStream,
// Stream to read and write data, based on File // Stream to read and write data, based on File
class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XInputStream> class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper1<css::io::XInputStream>
{ {
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
::osl::File* m_pFile; ::osl::File* m_pFile;
@@ -42,19 +41,19 @@ public:
OSLInputStreamWrapper(::osl::File& _rStream); OSLInputStreamWrapper(::osl::File& _rStream);
virtual ~OSLInputStreamWrapper(); virtual ~OSLInputStreamWrapper();
// stario::XInputStream // css::io::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 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(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(css::io::NotConnectedException, css::io::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 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(stario::NotConnectedException, 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(stario::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, // FmUnoOutStream,
// data sink for the files // data sink for the files
class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XOutputStream> class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<css::io::XOutputStream>
{ {
public: public:
COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper(::osl::File& _rFile); COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper(::osl::File& _rFile);
@@ -62,10 +61,10 @@ public:
private: private:
virtual ~OSLOutputStreamWrapper(); virtual ~OSLOutputStreamWrapper();
// stario::XOutputStream // css::io::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 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(stario::NotConnectedException, stario::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(stario::NotConnectedException, stario::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; ::osl::File& rFile;
}; };

12
include/comphelper/streamsection.hxx
View File

@@ -28,8 +28,6 @@
namespace comphelper namespace comphelper
{ {
namespace stario = ::com::sun::star::io;
/** implements handling for compatibly reading/writing data from/into an input/output stream. /** 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 data written in a block secured by this class should be readable by older versions which
use the same mechanism. use the same mechanism.
@@ -40,9 +38,9 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC OStreamSection class COMPHELPER_DLLPUBLIC OStreamSection
{ {
css::uno::Reference< stario::XMarkableStream > m_xMarkStream; css::uno::Reference< css::io::XMarkableStream > m_xMarkStream;
css::uno::Reference< stario::XDataInputStream > m_xInStream; css::uno::Reference< css::io::XDataInputStream > m_xInStream;
css::uno::Reference< stario::XDataOutputStream > m_xOutStream; css::uno::Reference< css::io::XDataOutputStream > m_xOutStream;
sal_Int32 m_nBlockStart; sal_Int32 m_nBlockStart;
sal_Int32 m_nBlockLen; sal_Int32 m_nBlockLen;
@@ -52,7 +50,7 @@ public:
@param _rxInput the stream to read from. Must support the @param _rxInput the stream to read from. Must support the
com::sun::star::io::XMarkableStream interface 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 /** 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 @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 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. 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. <BR>If constructed for writing, the section "opened" by this object will be "closed".<BR> /** dtor. <BR>If constructed for writing, the section "opened" by this object will be "closed".<BR>
If constructed for reading, any remaining bytes 'til the end of the section will be skipped. If constructed for reading, any remaining bytes 'til the end of the section will be skipped.