diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /io/source/TextOutputStream | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) |
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.
Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly). The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually). There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).
Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code. Missing @throws
documentation has not been applied in such manual clean-up.
Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'io/source/TextOutputStream')
-rw-r--r-- | io/source/TextOutputStream/TextOutputStream.cxx | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index bd2004e26a3d..323eb88e820b 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -62,36 +62,29 @@ class OTextOutputStream : public WeakImplHelper< XTextOutputStream2, XServiceInf Sequence<sal_Int8> implConvert( const OUString& rSource ); /// @throws IOException - void checkOutputStream() throw(IOException); + void checkOutputStream(); public: OTextOutputStream(); virtual ~OTextOutputStream() override; // Methods XTextOutputStream - virtual void SAL_CALL writeString( const OUString& aString ) - throw(IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL setEncoding( const OUString& Encoding ) - throw(RuntimeException, std::exception) override; + virtual void SAL_CALL writeString( const OUString& aString ) override; + virtual void SAL_CALL setEncoding( const OUString& Encoding ) override; // Methods XOutputStream - virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL flush( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeOutput( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, 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; // Methods 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; // Methods XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; }; OTextOutputStream::OTextOutputStream() @@ -162,7 +155,6 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource ) // XTextOutputStream void OTextOutputStream::writeString( const OUString& aString ) - throw(IOException, RuntimeException, std::exception) { checkOutputStream(); if( !mbEncodingInitialized ) @@ -178,7 +170,6 @@ void OTextOutputStream::writeString( const OUString& aString ) } void OTextOutputStream::setEncoding( const OUString& Encoding ) - throw(RuntimeException, std::exception) { OString aOEncodingStr = OUStringToOString( Encoding, RTL_TEXTENCODING_ASCII_US ); rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( aOEncodingStr.getStr() ); @@ -194,21 +185,18 @@ void OTextOutputStream::setEncoding( const OUString& Encoding ) // XOutputStream void OTextOutputStream::writeBytes( const Sequence< sal_Int8 >& aData ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { checkOutputStream(); mxStream->writeBytes( aData ); } void OTextOutputStream::flush( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { checkOutputStream(); mxStream->flush(); } void OTextOutputStream::closeOutput( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { checkOutputStream(); mxStream->closeOutput(); @@ -216,7 +204,6 @@ void OTextOutputStream::closeOutput( ) void OTextOutputStream::checkOutputStream() - throw(IOException) { if (! mxStream.is() ) throw IOException("output stream is not initialized, you have to use setOutputStream first"); @@ -226,13 +213,11 @@ void OTextOutputStream::checkOutputStream() // XActiveDataSource void OTextOutputStream::setOutputStream( const Reference< XOutputStream >& aStream ) - throw(RuntimeException, std::exception) { mxStream = aStream; } Reference< XOutputStream > OTextOutputStream::getOutputStream() - throw(RuntimeException, std::exception) { return mxStream; } @@ -256,17 +241,17 @@ Sequence< OUString > TextOutputStream_getSupportedServiceNames() return seqNames; } -OUString OTextOutputStream::getImplementationName() throw(std::exception) +OUString OTextOutputStream::getImplementationName() { return TextOutputStream_getImplementationName(); } -sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName) throw(std::exception) +sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > OTextOutputStream::getSupportedServiceNames() throw(std::exception) +Sequence< OUString > OTextOutputStream::getSupportedServiceNames() { return TextOutputStream_getSupportedServiceNames(); } |