Skip to content

C
core
Kaydet (Commit) 091fc82b authored tarafından Thomas Arnhold's avatar Thomas Arnhold
Dosyalara gözat
Seçenekler

unotools: staruno -> css::uno 

Change-Id: I20a470fe654bfd1eec23dd2e0c13162a0b432a32
üst e189fa40
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 60 deletions
include/unotools/streamhelper.hxx
Dosyayı görüntüle @ 091fc82b
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
namespace utl namespace utl
{ {
namespace stario = ::com::sun::star::io; namespace stario = ::com::sun::star::io;
namespace staruno = ::com::sun::star::uno;
/** /**
* The helper implementation for a using input streams based on SvLockBytes. * The helper implementation for a using input streams based on SvLockBytes.
...@@ -54,16 +53,16 @@ public: ...@@ -54,16 +53,16 @@ public:
,m_nActPos(_nPos) ,m_nActPos(_nPos)
,m_nAvailable(_nAvailable){} ,m_nAvailable(_nAvailable){}
// staruno::XInterface // css::uno::XInterface
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL acquire() throw () SAL_OVERRIDE;
virtual void SAL_CALL release() throw () SAL_OVERRIDE; virtual void SAL_CALL release() throw () SAL_OVERRIDE;
// stario::XInputStream // stario::XInputStream
virtual sal_Int32 SAL_CALL readBytes( staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL readSomeBytes( staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::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, stario::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL available( ) throw(stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available( ) throw(stario::NotConnectedException, stario::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL closeInput( ) throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput( ) throw (stario::NotConnectedException, stario::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL seek( sal_Int64 location ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL seek( sal_Int64 location ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int64 SAL_CALL getPosition( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getPosition( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
......
include/unotools/streamsection.hxx
Dosyayı görüntüle @ 091fc82b
...@@ -28,7 +28,6 @@ namespace utl ...@@ -28,7 +28,6 @@ namespace utl
{ {
namespace stario = ::com::sun::star::io; namespace stario = ::com::sun::star::io;
namespace staruno = ::com::sun::star::uno;
/** 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
...@@ -40,9 +39,9 @@ namespace utl ...@@ -40,9 +39,9 @@ namespace utl
class OStreamSection class OStreamSection
{ {
staruno::Reference< stario::XMarkableStream > m_xMarkStream; css::uno::Reference< stario::XMarkableStream > m_xMarkStream;
staruno::Reference< stario::XDataInputStream > m_xInStream; css::uno::Reference< stario::XDataInputStream > m_xInStream;
staruno::Reference< stario::XDataOutputStream > m_xOutStream; css::uno::Reference< stario::XDataOutputStream > m_xOutStream;
sal_Int32 m_nBlockStart; sal_Int32 m_nBlockStart;
sal_Int32 m_nBlockLen; sal_Int32 m_nBlockLen;
...@@ -52,7 +51,7 @@ public: ...@@ -52,7 +51,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 staruno::Reference< stario::XDataInputStream >& _rxInput); OStreamSection(const css::uno::Reference< stario::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 +61,7 @@ public: ...@@ -62,7 +61,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 staruno::Reference< stario::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength = 0); OStreamSection(const css::uno::Reference< stario::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.
......
include/unotools/streamwrap.hxx
Dosyayı görüntüle @ 091fc82b
...@@ -35,7 +35,6 @@ class SvStream; ...@@ -35,7 +35,6 @@ class SvStream;
namespace utl namespace utl
{ {
namespace stario = ::com::sun::star::io; namespace stario = ::com::sun::star::io;
namespace staruno = ::com::sun::star::uno;
//= OInputStreamWrapper //= OInputStreamWrapper
...@@ -60,11 +59,11 @@ public: ...@@ -60,11 +59,11 @@ public:
virtual ~OInputStreamWrapper(); virtual ~OInputStreamWrapper();
// stario::XInputStream // stario::XInputStream
virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; 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(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::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, staruno::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, staruno::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, staruno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected: protected:
/// throws a NotConnectedException if the object is not connected anymore /// throws a NotConnectedException if the object is not connected anymore
...@@ -107,9 +106,9 @@ protected: ...@@ -107,9 +106,9 @@ protected:
virtual ~OOutputStreamWrapper(); virtual ~OOutputStreamWrapper();
// stario::XOutputStream // stario::XOutputStream
virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; 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, staruno::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, staruno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// throws an exception according to the error flag of m_pSvStream /// throws an exception according to the error flag of m_pSvStream
void checkError() const; void checkError() const;
...@@ -156,9 +155,9 @@ public: ...@@ -156,9 +155,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// stario::XOutputStream // stario::XOutputStream
virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; 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, staruno::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, staruno::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 truncate() throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL truncate() throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };
......
unotools/source/streaming/streamhelper.cxx
Dosyayı görüntüle @ 091fc82b
...@@ -32,14 +32,14 @@ void SAL_CALL OInputStreamHelper::release() throw () ...@@ -32,14 +32,14 @@ void SAL_CALL OInputStreamHelper::release() throw ()
InputStreamHelper_Base::release(); InputStreamHelper_Base::release();
} }
sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) sal_Int32 SAL_CALL OInputStreamHelper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, css::uno::RuntimeException, std::exception)
{ {
if (!m_xLockBytes.Is()) 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) 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 ); ::osl::MutexGuard aGuard( m_aMutex );
aData.realloc(nBytesToRead); aData.realloc(nBytesToRead);
...@@ -49,7 +49,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& ...@@ -49,7 +49,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >&
m_nActPos += nRead; m_nActPos += nRead;
if (nError != ERRCODE_NONE) 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 // adjust sequence if data read is lower than the desired data
if (nRead < (sal_uInt32)nBytesToRead) if (nRead < (sal_uInt32)nBytesToRead)
...@@ -80,43 +80,43 @@ sal_Int64 SAL_CALL OInputStreamHelper::getLength( ) throw(::com::sun::star::io: ...@@ -80,43 +80,43 @@ sal_Int64 SAL_CALL OInputStreamHelper::getLength( ) throw(::com::sun::star::io:
return aStat.nSize; 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) 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 // read all data desired
return readBytes(aData, nMaxBytesToRead); return readBytes(aData, nMaxBytesToRead);
} }
void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip) 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 ); ::osl::MutexGuard aGuard( m_aMutex );
if (!m_xLockBytes.Is()) 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) 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; m_nActPos += nBytesToSkip;
} }
sal_Int32 SAL_CALL OInputStreamHelper::available() 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 ); ::osl::MutexGuard aGuard( m_aMutex );
if (!m_xLockBytes.Is()) 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; return m_nAvailable;
} }
void SAL_CALL OInputStreamHelper::closeInput() 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 ); ::osl::MutexGuard aGuard( m_aMutex );
if (!m_xLockBytes.Is()) 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; m_xLockBytes = NULL;
} }
......
unotools/source/streaming/streamwrap.cxx
Dosyayı görüntüle @ 091fc82b
...@@ -45,13 +45,13 @@ OInputStreamWrapper::~OInputStreamWrapper() ...@@ -45,13 +45,13 @@ OInputStreamWrapper::~OInputStreamWrapper()
delete m_pSvStream; delete m_pSvStream;
} }
sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
{ {
checkConnected(); checkConnected();
if (nBytesToRead < 0) 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 ); ::osl::MutexGuard aGuard( m_aMutex );
...@@ -60,19 +60,19 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& ...@@ -60,19 +60,19 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >&
sal_uInt32 nRead = m_pSvStream->Read((void*)aData.getArray(), nBytesToRead); sal_uInt32 nRead = m_pSvStream->Read((void*)aData.getArray(), nBytesToRead);
checkError(); checkError();
// Wenn gelesene Zeichen < MaxLength, staruno::Sequence anpassen // Wenn gelesene Zeichen < MaxLength, css::uno::Sequence anpassen
if (nRead < (sal_uInt32)nBytesToRead) if (nRead < (sal_uInt32)nBytesToRead)
aData.realloc( nRead ); aData.realloc( nRead );
return 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(); checkError();
if (nMaxBytesToRead < 0) 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()) if (m_pSvStream->IsEof())
{ {
...@@ -83,7 +83,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int ...@@ -83,7 +83,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int
return readBytes(aData, nMaxBytesToRead); 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 ); ::osl::MutexGuard aGuard( m_aMutex );
checkError(); checkError();
...@@ -92,7 +92,7 @@ void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( star ...@@ -92,7 +92,7 @@ void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( star
checkError(); 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 ); ::osl::MutexGuard aGuard( m_aMutex );
checkConnected(); checkConnected();
...@@ -110,7 +110,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedE ...@@ -110,7 +110,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedE
return nAvailable; 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 ); ::osl::MutexGuard aGuard( m_aMutex );
checkConnected(); checkConnected();
...@@ -124,7 +124,7 @@ void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedExcep ...@@ -124,7 +124,7 @@ void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedExcep
void OInputStreamWrapper::checkConnected() const void OInputStreamWrapper::checkConnected() const
{ {
if (!m_pSvStream) 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 void OInputStreamWrapper::checkError() const
...@@ -133,7 +133,7 @@ void OInputStreamWrapper::checkError() const ...@@ -133,7 +133,7 @@ void OInputStreamWrapper::checkError() const
if (m_pSvStream->SvStream::GetError() != ERRCODE_NONE) if (m_pSvStream->SvStream::GetError() != ERRCODE_NONE)
// TODO: really evaluate the error // 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 //= OSeekableInputStreamWrapper
...@@ -192,7 +192,7 @@ OOutputStreamWrapper::OOutputStreamWrapper(SvStream& _rStream): ...@@ -192,7 +192,7 @@ OOutputStreamWrapper::OOutputStreamWrapper(SvStream& _rStream):
OOutputStreamWrapper::~OOutputStreamWrapper() {} 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()); sal_uInt32 nWritten = rStream.Write(aData.getConstArray(),aData.getLength());
ErrCode err = rStream.GetError(); ErrCode err = rStream.GetError();
...@@ -200,17 +200,17 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 ...@@ -200,17 +200,17 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8
|| (nWritten != (sal_uInt32)aData.getLength()) || (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(); rStream.Flush();
checkError(); 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 ...@@ -218,7 +218,7 @@ void OOutputStreamWrapper::checkError() const
{ {
if (rStream.GetError() != ERRCODE_NONE) if (rStream.GetError() != ERRCODE_NONE)
// TODO: really evaluate the error // 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 //= OSeekableOutputStreamWrapper
...@@ -290,7 +290,7 @@ OStreamWrapper::OStreamWrapper(SvStream& _rStream) ...@@ -290,7 +290,7 @@ OStreamWrapper::OStreamWrapper(SvStream& _rStream)
return this; 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()); sal_uInt32 nWritten = m_pSvStream->Write(aData.getConstArray(),aData.getLength());
ErrCode err = m_pSvStream->GetError(); ErrCode err = m_pSvStream->GetError();
...@@ -298,18 +298,18 @@ void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aD ...@@ -298,18 +298,18 @@ void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aD
|| (nWritten != (sal_uInt32)aData.getLength()) || (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(); m_pSvStream->Flush();
if (m_pSvStream->GetError() != ERRCODE_NONE) 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)
{ {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment