diff options
Diffstat (limited to 'oox/source/helper/textinputstream.cxx')
| -rw-r--r-- | oox/source/helper/textinputstream.cxx | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index 70b657f59fdd..6159edee7a8b 100644 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -43,20 +43,15 @@ class UnoBinaryInputStream : public UnoBinaryInputStream_BASE public: explicit UnoBinaryInputStream( BinaryInputStream& rInStrm ); - virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available() - throw (NotConnectedException, IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput() - throw (NotConnectedException, IOException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) override; + virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) override; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override; + virtual sal_Int32 SAL_CALL available() override; + virtual void SAL_CALL closeInput() override; private: /// @throws NotConnectedException - void ensureConnected() const throw (NotConnectedException); + void ensureConnected() const; private: BinaryInputStream* mpInStrm; @@ -68,40 +63,37 @@ UnoBinaryInputStream::UnoBinaryInputStream( BinaryInputStream& rInStrm ) : } sal_Int32 SAL_CALL UnoBinaryInputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { ensureConnected(); return mpInStrm->readData( rData, nBytesToRead ); } sal_Int32 SAL_CALL UnoBinaryInputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { ensureConnected(); return mpInStrm->readData( rData, nMaxBytesToRead ); } void SAL_CALL UnoBinaryInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { ensureConnected(); mpInStrm->skip( nBytesToSkip ); } -sal_Int32 SAL_CALL UnoBinaryInputStream::available() throw (NotConnectedException, IOException, RuntimeException, std::exception) +sal_Int32 SAL_CALL UnoBinaryInputStream::available() { ensureConnected(); throw RuntimeException( "Functionality not supported", Reference< XInputStream >() ); } -void SAL_CALL UnoBinaryInputStream::closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception) +void SAL_CALL UnoBinaryInputStream::closeInput() { ensureConnected(); mpInStrm->close(); mpInStrm = nullptr; } -void UnoBinaryInputStream::ensureConnected() const throw (NotConnectedException) +void UnoBinaryInputStream::ensureConnected() const { if( !mpInStrm ) throw NotConnectedException( "Stream closed" ); |