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 /xmlscript/source/xmlmod_imexp | |
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 'xmlscript/source/xmlmod_imexp')
-rw-r--r-- | xmlscript/source/xmlmod_imexp/imp_share.hxx | 42 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 14 |
2 files changed, 14 insertions, 42 deletions
diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx index 1f170a0dc8ca..78c4d2a54830 100644 --- a/xmlscript/source/xmlmod_imexp/imp_share.hxx +++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx @@ -67,20 +67,15 @@ public: // XRoot virtual void SAL_CALL startDocument( - css::uno::Reference< css::xml::input::XNamespaceMapping > const & xNamespaceMapping ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::xml::input::XNamespaceMapping > const & xNamespaceMapping ) override; + virtual void SAL_CALL endDocument() override; virtual void SAL_CALL processingInstruction( - OUString const & rTarget, OUString const & rData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & rTarget, OUString const & rData ) override; virtual void SAL_CALL setDocumentLocator( - css::uno::Reference< css::xml::sax::XLocator > const & xLocator ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::xml::sax::XLocator > const & xLocator ) override; virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startRootElement( sal_Int32 nUid, OUString const & rLocalName, - css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override; }; class ModuleElement @@ -100,28 +95,19 @@ public: virtual ~ModuleElement() override; // XElement - virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUid() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() override; + virtual OUString SAL_CALL getLocalName() override; + virtual sal_Int32 SAL_CALL getUid() override; + virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() override; virtual void SAL_CALL ignorableWhitespace( - OUString const & rWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( OUString const & rChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & rWhitespaces ) override; + virtual void SAL_CALL characters( OUString const & rChars ) override; virtual void SAL_CALL processingInstruction( - OUString const & rTarget, OUString const & rData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & rTarget, OUString const & rData ) override; + virtual void SAL_CALL endElement() override; virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement( sal_Int32 nUid, OUString const & rLocalName, - css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override; }; } diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index cb562815d7c4..07f67d45f72c 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -31,47 +31,39 @@ namespace xmlscript { Reference< xml::input::XElement > ModuleElement::getParent() - throw (RuntimeException, std::exception) { return nullptr; } OUString ModuleElement::getLocalName() - throw (RuntimeException, std::exception) { return _aLocalName; } sal_Int32 ModuleElement::getUid() - throw (RuntimeException, std::exception) { return mxImport->XMLNS_SCRIPT_UID; } Reference< xml::input::XAttributes > ModuleElement::getAttributes() - throw (RuntimeException, std::exception) { return _xAttributes; } void ModuleElement::ignorableWhitespace( OUString const & /*rWhitespaces*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { // not used } void ModuleElement::characters( OUString const & rChars ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { _strBuffer.append( rChars ); } void ModuleElement::processingInstruction( OUString const & /*rTarget*/, OUString const & /*rData*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { } void ModuleElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { mxImport->mrModuleDesc.aCode = _strBuffer.makeStringAndClear(); } @@ -79,7 +71,6 @@ void ModuleElement::endElement() Reference< xml::input::XElement > ModuleElement::startChildElement( sal_Int32 /*nUid*/, OUString const & /*rLocalName*/, Reference< xml::input::XAttributes > const & /*xAttributes*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() ); } @@ -103,7 +94,6 @@ ModuleElement::~ModuleElement() void ModuleImport::startDocument( Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { XMLNS_SCRIPT_UID = xNamespaceMapping->getUidByUri( XMLNS_SCRIPT_URI ); XMLNS_LIBRARY_UID = xNamespaceMapping->getUidByUri( XMLNS_LIBRARY_URI ); @@ -111,27 +101,23 @@ void ModuleImport::startDocument( } void ModuleImport::endDocument() - throw (xml::sax::SAXException, RuntimeException, std::exception) { // ignored } void ModuleImport::processingInstruction( OUString const & /*rTarget*/, OUString const & /*rData*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { } void ModuleImport::setDocumentLocator( Reference< xml::sax::XLocator > const & /*xLocator*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { } Reference< xml::input::XElement > ModuleImport::startRootElement( sal_Int32 nUid, OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { if (XMLNS_SCRIPT_UID != nUid) { |