diff options
Diffstat (limited to 'io/source/stm/odata.cxx')
| -rw-r--r-- | io/source/stm/odata.cxx | 350 |
1 files changed, 123 insertions, 227 deletions
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 64e1800af279..ff2307bc91a7 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -63,50 +63,39 @@ public: } public: // XInputStream - virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available() throw ( NotConnectedException, - RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput() throw ( NotConnectedException, - RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override; + virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, 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; public: // XDataInputStream - virtual sal_Int8 SAL_CALL readBoolean() throw (IOException, RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL readByte() throw (IOException, RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL readChar() throw (IOException, RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL readShort() throw (IOException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readLong() throw (IOException, RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL readHyper() throw (IOException, RuntimeException, std::exception) override; - virtual float SAL_CALL readFloat() throw (IOException, RuntimeException, std::exception) override; - virtual double SAL_CALL readDouble() throw (IOException, RuntimeException, std::exception) override; - virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL readBoolean() override; + virtual sal_Int8 SAL_CALL readByte() override; + virtual sal_Unicode SAL_CALL readChar() override; + virtual sal_Int16 SAL_CALL readShort() override; + virtual sal_Int32 SAL_CALL readLong() override; + virtual sal_Int64 SAL_CALL readHyper() override; + virtual float SAL_CALL readFloat() override; + virtual double SAL_CALL readDouble() override; + virtual OUString SAL_CALL readUTF() override; public: // XActiveDataSink - virtual void SAL_CALL setInputStream(const Reference< XInputStream > & aStream) - throw (RuntimeException, std::exception) override; - virtual Reference< XInputStream > SAL_CALL getInputStream() throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setInputStream(const Reference< XInputStream > & aStream) override; + virtual Reference< XInputStream > SAL_CALL getInputStream() override; public: // XConnectable - virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) throw (RuntimeException, std::exception) override; - virtual Reference < XConnectable > SAL_CALL getPredecessor() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) throw (RuntimeException, std::exception) override; - virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) override ; + virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) override; + virtual Reference < XConnectable > SAL_CALL getPredecessor() override; + virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) override; + virtual Reference < XConnectable > SAL_CALL getSuccessor() override ; public: // XServiceInfo - OUString SAL_CALL getImplementationName() throw (std::exception) override; - Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) override; - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) override; + OUString SAL_CALL getImplementationName() override; + Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; protected: @@ -118,9 +107,6 @@ protected: // XInputStream sal_Int32 ODataInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) { sal_Int32 nRead; @@ -137,9 +123,6 @@ sal_Int32 ODataInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBy } sal_Int32 ODataInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) { sal_Int32 nRead; if( m_bValidStream ) { @@ -152,9 +135,6 @@ sal_Int32 ODataInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 return nRead; } void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip) - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) { if( m_bValidStream ) { m_input->skipBytes( nBytesToSkip ); @@ -167,8 +147,6 @@ void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip) sal_Int32 ODataInputStream::available() - throw ( NotConnectedException, - RuntimeException, std::exception) { sal_Int32 nAvail; @@ -184,8 +162,6 @@ sal_Int32 ODataInputStream::available() } void ODataInputStream::closeInput() - throw ( NotConnectedException, - RuntimeException, std::exception) { if( m_bValidStream ) { m_input->closeInput( ); @@ -204,12 +180,12 @@ void ODataInputStream::closeInput() //== XDataInputStream =========================================== // XDataInputStream -sal_Int8 ODataInputStream::readBoolean() throw (IOException, RuntimeException, std::exception) +sal_Int8 ODataInputStream::readBoolean() { return readByte(); } -sal_Int8 ODataInputStream::readByte() throw (IOException, RuntimeException, std::exception) +sal_Int8 ODataInputStream::readByte() { Sequence<sal_Int8> aTmp(1); if( 1 != readBytes( aTmp, 1 ) ) @@ -219,7 +195,7 @@ sal_Int8 ODataInputStream::readByte() throw (IOException, RuntimeException, s return aTmp.getArray()[0]; } -sal_Unicode ODataInputStream::readChar() throw (IOException, RuntimeException, std::exception) +sal_Unicode ODataInputStream::readChar() { Sequence<sal_Int8> aTmp(2); if( 2 != readBytes( aTmp, 2 ) ) @@ -231,7 +207,7 @@ sal_Unicode ODataInputStream::readChar() throw (IOException, RuntimeException, s return ((sal_Unicode)pBytes[0] << 8) + pBytes[1]; } -sal_Int16 ODataInputStream::readShort() throw (IOException, RuntimeException, std::exception) +sal_Int16 ODataInputStream::readShort() { Sequence<sal_Int8> aTmp(2); if( 2 != readBytes( aTmp, 2 ) ) @@ -244,7 +220,7 @@ sal_Int16 ODataInputStream::readShort() throw (IOException, RuntimeException, st } -sal_Int32 ODataInputStream::readLong() throw (IOException, RuntimeException, std::exception) +sal_Int32 ODataInputStream::readLong() { Sequence<sal_Int8> aTmp(4); if( 4 != readBytes( aTmp, 4 ) ) @@ -257,7 +233,7 @@ sal_Int32 ODataInputStream::readLong() throw (IOException, RuntimeException, std } -sal_Int64 ODataInputStream::readHyper() throw (IOException, RuntimeException, std::exception) +sal_Int64 ODataInputStream::readHyper() { Sequence<sal_Int8> aTmp(8); if( 8 != readBytes( aTmp, 8 ) ) @@ -277,14 +253,14 @@ sal_Int64 ODataInputStream::readHyper() throw (IOException, RuntimeException, st pBytes[7]; } -float ODataInputStream::readFloat() throw (IOException, RuntimeException, std::exception) +float ODataInputStream::readFloat() { union { float f; sal_uInt32 n; } a; a.n = readLong(); return a.f; } -double ODataInputStream::readDouble() throw (IOException, RuntimeException, std::exception) +double ODataInputStream::readDouble() { union { double d; struct { sal_uInt32 n1; sal_uInt32 n2; } ad; } a; #if defined OSL_LITENDIAN @@ -297,7 +273,7 @@ double ODataInputStream::readDouble() throw (IOException, RuntimeException, std: return a.d; } -OUString ODataInputStream::readUTF() throw (IOException, RuntimeException, std::exception) +OUString ODataInputStream::readUTF() { sal_uInt16 nShortLen = (sal_uInt16)readShort(); sal_Int32 nUTFLen; @@ -378,7 +354,6 @@ OUString ODataInputStream::readUTF() throw (IOException, RuntimeException, std:: // XActiveDataSource void ODataInputStream::setInputStream(const Reference< XInputStream > & aStream) - throw (RuntimeException, std::exception) { if( m_input != aStream ) { @@ -391,14 +366,14 @@ void ODataInputStream::setInputStream(const Reference< XInputStream > & aStream) m_bValidStream = m_input.is(); } -Reference< XInputStream > ODataInputStream::getInputStream() throw (RuntimeException, std::exception) +Reference< XInputStream > ODataInputStream::getInputStream() { return m_input; } // XDataSink -void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) throw (RuntimeException, std::exception) +void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) { /// if the references match, nothing needs to be done if( m_succ != r ) { @@ -413,7 +388,7 @@ void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) throw } } -Reference < XConnectable > ODataInputStream::getSuccessor() throw (RuntimeException, std::exception) +Reference < XConnectable > ODataInputStream::getSuccessor() { return m_succ; } @@ -421,7 +396,6 @@ Reference < XConnectable > ODataInputStream::getSuccessor() throw (RuntimeExcept // XDataSource void ODataInputStream::setPredecessor( const Reference < XConnectable > &r ) - throw (RuntimeException, std::exception) { if( r != m_pred ) { m_pred = r; @@ -431,25 +405,25 @@ void ODataInputStream::setPredecessor( const Reference < XConnectable > &r ) } } } -Reference < XConnectable > ODataInputStream::getPredecessor() throw (RuntimeException, std::exception) +Reference < XConnectable > ODataInputStream::getPredecessor() { return m_pred; } // XServiceInfo -OUString ODataInputStream::getImplementationName() throw (std::exception) +OUString ODataInputStream::getImplementationName() { return ODataInputStream_getImplementationName(); } // XServiceInfo -sal_Bool ODataInputStream::supportsService(const OUString& ServiceName) throw (std::exception) +sal_Bool ODataInputStream::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -Sequence< OUString > ODataInputStream::getSupportedServiceNames() throw (std::exception) +Sequence< OUString > ODataInputStream::getSupportedServiceNames() { return ODataInputStream_getSupportedServiceNames(); } @@ -463,7 +437,6 @@ Sequence< OUString > ODataInputStream::getSupportedServiceNames() throw (std::ex Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) - throw( Exception) { ODataInputStream *p = new ODataInputStream; return Reference< XInterface > ( static_cast<OWeakObject *>(p) ); @@ -495,49 +468,35 @@ public: } public: // XOutputStream - virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override; - virtual void SAL_CALL flush() - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override; - virtual void SAL_CALL closeOutput() - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override; + virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; public: // XDataOutputStream - virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL writeBoolean(sal_Bool Value) override; + virtual void SAL_CALL writeByte(sal_Int8 Value) override; + virtual void SAL_CALL writeChar(sal_Unicode Value) override; + virtual void SAL_CALL writeShort(sal_Int16 Value) override; + virtual void SAL_CALL writeLong(sal_Int32 Value) override; + virtual void SAL_CALL writeHyper(sal_Int64 Value) override; + virtual void SAL_CALL writeFloat(float Value) override; + virtual void SAL_CALL writeDouble(double Value) override; + virtual void SAL_CALL writeUTF(const OUString& Value) override; public: // XActiveDataSource - virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream) - throw (RuntimeException, std::exception) override; - virtual Reference < XOutputStream > SAL_CALL getOutputStream() throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream) override; + virtual Reference < XOutputStream > SAL_CALL getOutputStream() override; public: // XConnectable - virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) - throw (RuntimeException, std::exception) override; - virtual Reference < XConnectable > SAL_CALL getPredecessor() - throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) - throw (RuntimeException, std::exception) override; - virtual Reference < XConnectable > SAL_CALL getSuccessor() - throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) override; + virtual Reference < XConnectable > SAL_CALL getPredecessor() override; + virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) override; + virtual Reference < XConnectable > SAL_CALL getSuccessor() override; public: // XServiceInfo - OUString SAL_CALL getImplementationName() throw (std::exception) override; - Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) override; - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) override; + OUString SAL_CALL getImplementationName() override; + Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; protected: Reference < XConnectable > m_succ; @@ -548,9 +507,6 @@ protected: // XOutputStream void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData) - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) { if( m_bValidStream ) { @@ -562,9 +518,6 @@ void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData) } void ODataOutputStream::flush() - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) { if( m_bValidStream ) { @@ -579,9 +532,6 @@ void ODataOutputStream::flush() void ODataOutputStream::closeOutput() - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) { if( m_bValidStream ) { @@ -598,8 +548,6 @@ void ODataOutputStream::closeOutput() // XDataOutputStream void ODataOutputStream::writeBoolean(sal_Bool Value) - throw ( IOException, - RuntimeException, std::exception) { if( Value ) { @@ -613,8 +561,6 @@ void ODataOutputStream::writeBoolean(sal_Bool Value) void ODataOutputStream::writeByte(sal_Int8 Value) - throw ( IOException, - RuntimeException, std::exception) { Sequence<sal_Int8> aTmp( 1 ); aTmp.getArray()[0] = Value; @@ -622,8 +568,6 @@ void ODataOutputStream::writeByte(sal_Int8 Value) } void ODataOutputStream::writeChar(sal_Unicode Value) - throw ( IOException, - RuntimeException, std::exception) { Sequence<sal_Int8> aTmp( 2 ); sal_Int8 * pBytes = aTmp.getArray(); @@ -634,8 +578,6 @@ void ODataOutputStream::writeChar(sal_Unicode Value) void ODataOutputStream::writeShort(sal_Int16 Value) - throw ( IOException, - RuntimeException, std::exception) { Sequence<sal_Int8> aTmp( 2 ); sal_Int8 * pBytes = aTmp.getArray(); @@ -645,8 +587,6 @@ void ODataOutputStream::writeShort(sal_Int16 Value) } void ODataOutputStream::writeLong(sal_Int32 Value) - throw ( IOException, - RuntimeException, std::exception) { Sequence<sal_Int8> aTmp( 4 ); sal_Int8 * pBytes = aTmp.getArray(); @@ -658,8 +598,6 @@ void ODataOutputStream::writeLong(sal_Int32 Value) } void ODataOutputStream::writeHyper(sal_Int64 Value) - throw ( IOException, - RuntimeException, std::exception) { Sequence<sal_Int8> aTmp( 8 ); sal_Int8 * pBytes = aTmp.getArray(); @@ -676,8 +614,6 @@ void ODataOutputStream::writeHyper(sal_Int64 Value) void ODataOutputStream::writeFloat(float Value) - throw ( IOException, - RuntimeException, std::exception) { union { float f; sal_uInt32 n; } a; a.f = Value; @@ -685,8 +621,6 @@ void ODataOutputStream::writeFloat(float Value) } void ODataOutputStream::writeDouble(double Value) - throw ( IOException, - RuntimeException, std::exception) { union { double d; struct { sal_uInt32 n1; sal_uInt32 n2; } ad; } a; a.d = Value; @@ -700,8 +634,6 @@ void ODataOutputStream::writeDouble(double Value) } void ODataOutputStream::writeUTF(const OUString& Value) - throw ( IOException, - RuntimeException, std::exception) { sal_Int32 nStrLen = Value.getLength(); const sal_Unicode * pStr = Value.getStr(); @@ -760,7 +692,6 @@ void ODataOutputStream::writeUTF(const OUString& Value) // XActiveDataSource void ODataOutputStream::setOutputStream(const Reference< XOutputStream > & aStream) - throw (RuntimeException, std::exception) { if( m_output != aStream ) { m_output = aStream; @@ -772,7 +703,6 @@ void ODataOutputStream::setOutputStream(const Reference< XOutputStream > & aStre } Reference< XOutputStream > ODataOutputStream::getOutputStream() - throw (RuntimeException, std::exception) { return m_output; } @@ -780,7 +710,6 @@ Reference< XOutputStream > ODataOutputStream::getOutputStream() // XDataSink void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r ) - throw (RuntimeException, std::exception) { /// if the references match, nothing needs to be done if( m_succ != r ) @@ -796,14 +725,14 @@ void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r ) } } } -Reference < XConnectable > ODataOutputStream::getSuccessor() throw (RuntimeException, std::exception) +Reference < XConnectable > ODataOutputStream::getSuccessor() { return m_succ; } // XDataSource -void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r ) throw (RuntimeException, std::exception) +void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r ) { if( r != m_pred ) { m_pred = r; @@ -813,33 +742,32 @@ void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r ) } } } -Reference < XConnectable > ODataOutputStream::getPredecessor() throw (RuntimeException, std::exception) +Reference < XConnectable > ODataOutputStream::getPredecessor() { return m_pred; } // XServiceInfo -OUString ODataOutputStream::getImplementationName() throw (std::exception) +OUString ODataOutputStream::getImplementationName() { return ODataOutputStream_getImplementationName(); } // XServiceInfo -sal_Bool ODataOutputStream::supportsService(const OUString& ServiceName) throw (std::exception) +sal_Bool ODataOutputStream::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -Sequence< OUString > ODataOutputStream::getSupportedServiceNames() throw (std::exception) +Sequence< OUString > ODataOutputStream::getSupportedServiceNames() { return ODataOutputStream_getSupportedServiceNames(); } Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) - throw(Exception) { ODataOutputStream *p = new ODataOutputStream; Reference< XInterface > xService = *p; @@ -899,60 +827,50 @@ public: public: // XOutputStream - virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override + virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) override { ODataOutputStream::writeBytes( aData ); } - virtual void SAL_CALL flush() - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override + virtual void SAL_CALL flush() override { ODataOutputStream::flush(); } - virtual void SAL_CALL closeOutput() - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override + virtual void SAL_CALL closeOutput() override { ODataOutputStream::closeOutput(); } public: // XDataOutputStream - virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception) override + virtual void SAL_CALL writeBoolean(sal_Bool Value) override { ODataOutputStream::writeBoolean( Value ); } - virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception) override + virtual void SAL_CALL writeByte(sal_Int8 Value) override { ODataOutputStream::writeByte( Value ); } - virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception) override + virtual void SAL_CALL writeChar(sal_Unicode Value) override { ODataOutputStream::writeChar( Value ); } - virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception) override + virtual void SAL_CALL writeShort(sal_Int16 Value) override { ODataOutputStream::writeShort( Value ); } - virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception) override + virtual void SAL_CALL writeLong(sal_Int32 Value) override { ODataOutputStream::writeLong( Value ); } - virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception) override + virtual void SAL_CALL writeHyper(sal_Int64 Value) override { ODataOutputStream::writeHyper( Value ); } - virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception) override + virtual void SAL_CALL writeFloat(float Value) override { ODataOutputStream::writeFloat( Value ); } - virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception) override + virtual void SAL_CALL writeDouble(double Value) override { ODataOutputStream::writeDouble( Value ); } - virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception) override + virtual void SAL_CALL writeUTF(const OUString& Value) override { ODataOutputStream::writeUTF( Value );} // XObjectOutputStream - virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) override; public: // XMarkableStream - virtual sal_Int32 SAL_CALL createMark() throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; - virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; - virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL createMark() override; + virtual void SAL_CALL deleteMark(sal_Int32 Mark) override; + virtual void SAL_CALL jumpToMark(sal_Int32 nMark) override; + virtual void SAL_CALL jumpToFurthest() override; + virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) override; public: // XServiceInfo - OUString SAL_CALL getImplementationName() throw (std::exception) override; - Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) override; - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) override; + OUString SAL_CALL getImplementationName() override; + Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; private: void connectToMarkable(); @@ -963,7 +881,7 @@ private: bool m_bValidMarkable; }; -void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) +void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj ) { connectToMarkable(); @@ -1059,7 +977,6 @@ void OObjectOutputStream::connectToMarkable() sal_Int32 OObjectOutputStream::createMark() - throw (IOException, RuntimeException, std::exception) { connectToMarkable(); // throws an exception, if a markable is not connected ! @@ -1067,7 +984,6 @@ sal_Int32 OObjectOutputStream::createMark() } void OObjectOutputStream::deleteMark(sal_Int32 Mark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception) { if( ! m_bValidMarkable ) { @@ -1077,7 +993,6 @@ void OObjectOutputStream::deleteMark(sal_Int32 Mark) } void OObjectOutputStream::jumpToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception) { if( ! m_bValidMarkable ) { @@ -1088,14 +1003,12 @@ void OObjectOutputStream::jumpToMark(sal_Int32 nMark) void OObjectOutputStream::jumpToFurthest() - throw (IOException, RuntimeException, std::exception) { connectToMarkable(); m_rMarkable->jumpToFurthest(); } sal_Int32 OObjectOutputStream::offsetToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception) { if( ! m_bValidMarkable ) { @@ -1107,7 +1020,6 @@ sal_Int32 OObjectOutputStream::offsetToMark(sal_Int32 nMark) Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) - throw(Exception) { OObjectOutputStream *p = new OObjectOutputStream; return Reference< XInterface > ( (static_cast< OWeakObject * >(p)) ); @@ -1125,19 +1037,19 @@ Sequence<OUString> OObjectOutputStream_getSupportedServiceNames() } // XServiceInfo -OUString OObjectOutputStream::getImplementationName() throw (std::exception) +OUString OObjectOutputStream::getImplementationName() { return OObjectOutputStream_getImplementationName(); } // XServiceInfo -sal_Bool OObjectOutputStream::supportsService(const OUString& ServiceName) throw (std::exception) +sal_Bool OObjectOutputStream::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -Sequence< OUString > OObjectOutputStream::getSupportedServiceNames() throw (std::exception) +Sequence< OUString > OObjectOutputStream::getSupportedServiceNames() { return OObjectOutputStream_getSupportedServiceNames(); } @@ -1156,70 +1068,55 @@ public: } public: // XInputStream - virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override { return ODataInputStream::readBytes( aData , nBytesToRead ); } - virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) override { return ODataInputStream::readSomeBytes( aData, nMaxBytesToRead ); } - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) - throw ( NotConnectedException, - BufferSizeExceededException, - RuntimeException, std::exception) override + virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) override { ODataInputStream::skipBytes( nBytesToSkip ); } - virtual sal_Int32 SAL_CALL available() - throw ( NotConnectedException, - RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL available() override { return ODataInputStream::available(); } - virtual void SAL_CALL closeInput() - throw ( NotConnectedException, - RuntimeException, std::exception) override + virtual void SAL_CALL closeInput() override { ODataInputStream::closeInput(); } public: // XDataInputStream - virtual sal_Int8 SAL_CALL readBoolean() throw (IOException, RuntimeException, std::exception) override + virtual sal_Int8 SAL_CALL readBoolean() override { return ODataInputStream::readBoolean(); } - virtual sal_Int8 SAL_CALL readByte() throw (IOException, RuntimeException, std::exception) override + virtual sal_Int8 SAL_CALL readByte() override { return ODataInputStream::readByte(); } - virtual sal_Unicode SAL_CALL readChar() throw (IOException, RuntimeException, std::exception) override + virtual sal_Unicode SAL_CALL readChar() override { return ODataInputStream::readChar(); } - virtual sal_Int16 SAL_CALL readShort() throw (IOException, RuntimeException, std::exception) override + virtual sal_Int16 SAL_CALL readShort() override { return ODataInputStream::readShort(); } - virtual sal_Int32 SAL_CALL readLong() throw (IOException, RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL readLong() override { return ODataInputStream::readLong(); } - virtual sal_Int64 SAL_CALL readHyper() throw (IOException, RuntimeException, std::exception) override + virtual sal_Int64 SAL_CALL readHyper() override { return ODataInputStream::readHyper(); } - virtual float SAL_CALL readFloat() throw (IOException, RuntimeException, std::exception) override + virtual float SAL_CALL readFloat() override { return ODataInputStream::readFloat(); } - virtual double SAL_CALL readDouble() throw (IOException, RuntimeException, std::exception) override + virtual double SAL_CALL readDouble() override { return ODataInputStream::readDouble(); } - virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) override + virtual OUString SAL_CALL readUTF() override { return ODataInputStream::readUTF(); } public: // XObjectInputStream - virtual Reference< XPersistObject > SAL_CALL readObject( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual Reference< XPersistObject > SAL_CALL readObject( ) override; public: // XMarkableStream - virtual sal_Int32 SAL_CALL createMark() - throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; - virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; - virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL createMark() override; + virtual void SAL_CALL deleteMark(sal_Int32 Mark) override; + virtual void SAL_CALL jumpToMark(sal_Int32 nMark) override; + virtual void SAL_CALL jumpToFurthest() override; + virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) override; public: // XServiceInfo - OUString SAL_CALL getImplementationName() throw (std::exception) override; - Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) override; - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) override; + OUString SAL_CALL getImplementationName() override; + Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; private: void connectToMarkable(); @@ -1232,7 +1129,7 @@ private: }; -Reference< XPersistObject > OObjectInputStream::readObject() throw (css::io::IOException, css::uno::RuntimeException, std::exception) +Reference< XPersistObject > OObjectInputStream::readObject() { // check if chain contains a XMarkableStream connectToMarkable(); @@ -1347,14 +1244,14 @@ void OObjectInputStream::connectToMarkable() } } -sal_Int32 OObjectInputStream::createMark() throw (IOException, RuntimeException, std::exception) +sal_Int32 OObjectInputStream::createMark() { connectToMarkable(); // throws an exception, if a markable is not connected ! return m_rMarkable->createMark(); } -void OObjectInputStream::deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) +void OObjectInputStream::deleteMark(sal_Int32 Mark) { if( ! m_bValidMarkable ) { @@ -1363,7 +1260,7 @@ void OObjectInputStream::deleteMark(sal_Int32 Mark) throw (IOException, m_rMarkable->deleteMark( Mark ); } -void OObjectInputStream::jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) +void OObjectInputStream::jumpToMark(sal_Int32 nMark) { if( ! m_bValidMarkable ) { @@ -1371,14 +1268,13 @@ void OObjectInputStream::jumpToMark(sal_Int32 nMark) throw (IOException, } m_rMarkable->jumpToMark( nMark ); } -void OObjectInputStream::jumpToFurthest() throw (IOException, RuntimeException, std::exception) +void OObjectInputStream::jumpToFurthest() { connectToMarkable(); m_rMarkable->jumpToFurthest(); } sal_Int32 OObjectInputStream::offsetToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception) { if( ! m_bValidMarkable ) { @@ -1388,24 +1284,24 @@ sal_Int32 OObjectInputStream::offsetToMark(sal_Int32 nMark) } // XServiceInfo -OUString OObjectInputStream::getImplementationName() throw (std::exception) +OUString OObjectInputStream::getImplementationName() { return OObjectInputStream_getImplementationName(); } // XServiceInfo -sal_Bool OObjectInputStream::supportsService(const OUString& ServiceName) throw (std::exception) +sal_Bool OObjectInputStream::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -Sequence< OUString > OObjectInputStream::getSupportedServiceNames() throw (std::exception) +Sequence< OUString > OObjectInputStream::getSupportedServiceNames() { return OObjectInputStream_getSupportedServiceNames(); } -Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference < XComponentContext > & rCtx ) throw(Exception) +Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference < XComponentContext > & rCtx ) { OObjectInputStream *p = new OObjectInputStream( rCtx ); return Reference< XInterface> ( (static_cast< OWeakObject * >(p)) ); |