From e57ca02849c3d87142ff5ff9099a212e72b8139c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Jan 2017 12:28:58 +0100 Subject: Remove dynamic exception specifications ...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at "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 Reviewed-by: Stephan Bergmann --- oox/source/crypto/DocumentDecryption.cxx | 34 +++++++++++--------------------- 1 file changed, 12 insertions(+), 22 deletions(-) (limited to 'oox/source/crypto/DocumentDecryption.cxx') diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index 3fcbc571d3f1..ed1111e8a549 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -53,12 +53,12 @@ vector convertToVector(Sequence& input) class AgileTokenHandler : public cppu::WeakImplHelper< XFastTokenHandler > { public: - virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) override { return FastToken::DONTKNOW; } - virtual Sequence SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception) override + virtual Sequence SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) override { return Sequence(); } @@ -73,21 +73,16 @@ public: mInfo(rInfo) {} - void SAL_CALL startDocument() - throw (RuntimeException, SAXException, std::exception) override + void SAL_CALL startDocument() override {} - void SAL_CALL endDocument() - throw (RuntimeException, SAXException, std::exception) override + void SAL_CALL endDocument() override {} - void SAL_CALL setDocumentLocator( const Reference< XLocator >& /*xLocator*/ ) - throw (RuntimeException, SAXException, std::exception) override + void SAL_CALL setDocumentLocator( const Reference< XLocator >& /*xLocator*/ ) override {} - void SAL_CALL startFastElement( sal_Int32 /*Element*/, const Reference< XFastAttributeList >& /*Attribs*/ ) - throw (RuntimeException, SAXException, std::exception) override + void SAL_CALL startFastElement( sal_Int32 /*Element*/, const Reference< XFastAttributeList >& /*Attribs*/ ) override {} - void SAL_CALL startUnknownElement( const OUString& /*aNamespace*/, const OUString& aName, const Reference< XFastAttributeList >& aAttributeList ) - throw (RuntimeException, SAXException, std::exception) override + void SAL_CALL startUnknownElement( const OUString& /*aNamespace*/, const OUString& aName, const Reference< XFastAttributeList >& aAttributeList ) override { if(aName == "keyData") { @@ -168,27 +163,22 @@ public: } } - void SAL_CALL endFastElement( sal_Int32 /*aElement*/ ) - throw (RuntimeException, SAXException, std::exception) override + void SAL_CALL endFastElement( sal_Int32 /*aElement*/ ) override {} - void SAL_CALL endUnknownElement( const OUString& /*aNamespace*/, const OUString& /*aName*/ ) - throw (RuntimeException, SAXException, std::exception) override + void SAL_CALL endUnknownElement( const OUString& /*aNamespace*/, const OUString& /*aName*/ ) override {} - Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 /*aElement*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) - throw (RuntimeException, SAXException, std::exception) override + Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 /*aElement*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) override { return nullptr; } - Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& /*aNamespace*/, const OUString& /*aName*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) - throw (RuntimeException, SAXException, std::exception) override + Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& /*aNamespace*/, const OUString& /*aName*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) override { return this; } - void SAL_CALL characters( const OUString& /*aChars*/ ) - throw (RuntimeException, SAXException, std::exception) override + void SAL_CALL characters( const OUString& /*aChars*/ ) override {} }; -- cgit v1.2.3