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 /include/sax | |
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 'include/sax')
-rw-r--r-- | include/sax/fastattribs.hxx | 14 | ||||
-rw-r--r-- | include/sax/fastparser.hxx | 26 | ||||
-rw-r--r-- | include/sax/tools/documenthandleradapter.hxx | 55 |
3 files changed, 41 insertions, 54 deletions
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx index 3b17dee8a02f..eeb4064e82fa 100644 --- a/include/sax/fastattribs.hxx +++ b/include/sax/fastattribs.hxx @@ -94,13 +94,13 @@ public: bool getAsChar( sal_Int32 nToken, const char*& rPos ) const; // XFastAttributeList - virtual sal_Bool SAL_CALL hasAttribute( ::sal_Int32 Token ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getValueToken( ::sal_Int32 Token ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getOptionalValueToken( ::sal_Int32 Token, ::sal_Int32 Default ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getValue( ::sal_Int32 Token ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getOptionalValue( ::sal_Int32 Token ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::xml::Attribute > SAL_CALL getUnknownAttributes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::xml::FastAttribute > SAL_CALL getFastAttributes() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasAttribute( ::sal_Int32 Token ) override; + virtual ::sal_Int32 SAL_CALL getValueToken( ::sal_Int32 Token ) override; + virtual ::sal_Int32 SAL_CALL getOptionalValueToken( ::sal_Int32 Token, ::sal_Int32 Default ) override; + virtual OUString SAL_CALL getValue( ::sal_Int32 Token ) override; + virtual OUString SAL_CALL getOptionalValue( ::sal_Int32 Token ) override; + virtual css::uno::Sequence< css::xml::Attribute > SAL_CALL getUnknownAttributes( ) override; + virtual css::uno::Sequence< css::xml::FastAttribute > SAL_CALL getFastAttributes() override; private: sal_Char *mpChunk; ///< buffer to store all attribute values - null terminated strings diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx index a238229e3f01..cb82dcf17210 100644 --- a/include/sax/fastparser.hxx +++ b/include/sax/fastparser.hxx @@ -56,23 +56,23 @@ public: virtual ~FastSaxParser() override; // css::lang::XInitialization: - virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments) override; // XFastParser - virtual void SAL_CALL parseStream( const css::xml::sax::InputSource& aInputSource ) throw (css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTokenHandler( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNamespaceURL( const OUString& rPrefix ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setErrorHandler( const css::uno::Reference< css::xml::sax::XErrorHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEntityResolver( const css::uno::Reference< css::xml::sax::XEntityResolver >& Resolver ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLocale( const css::lang::Locale& rLocale ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNamespaceHandler( const css::uno::Reference< css::xml::sax::XFastNamespaceHandler >& Handler) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL parseStream( const css::xml::sax::InputSource& aInputSource ) override; + virtual void SAL_CALL setFastDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& Handler ) override; + virtual void SAL_CALL setTokenHandler( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& Handler ) override; + virtual void SAL_CALL registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) override; + virtual OUString SAL_CALL getNamespaceURL( const OUString& rPrefix ) override; + virtual void SAL_CALL setErrorHandler( const css::uno::Reference< css::xml::sax::XErrorHandler >& Handler ) override; + virtual void SAL_CALL setEntityResolver( const css::uno::Reference< css::xml::sax::XEntityResolver >& Resolver ) override; + virtual void SAL_CALL setLocale( const css::lang::Locale& rLocale ) override; + virtual void SAL_CALL setNamespaceHandler( const css::uno::Reference< css::xml::sax::XFastNamespaceHandler >& Handler) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; } diff --git a/include/sax/tools/documenthandleradapter.hxx b/include/sax/tools/documenthandleradapter.hxx index 25e91a6fde62..dde4bce872ec 100644 --- a/include/sax/tools/documenthandleradapter.hxx +++ b/include/sax/tools/documenthandleradapter.hxx @@ -29,54 +29,48 @@ namespace sax public: // XDocumentHandler virtual void SAL_CALL - startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + startDocument() override { m_handler->startDocument(); } virtual void SAL_CALL - endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + endDocument() override { m_handler->endDocument(); } virtual void SAL_CALL startElement(const OUString& aName, - const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) override { m_handler->startElement(aName, xAttribs); } virtual void SAL_CALL - endElement(const OUString& aName) throw (css::xml::sax::SAXException, - css::uno::RuntimeException, std::exception) override + endElement(const OUString& aName) override { m_handler->endElement(aName); } virtual void SAL_CALL - characters(const OUString& aChars) throw (css::xml::sax::SAXException, - css::uno::RuntimeException, std::exception) override + characters(const OUString& aChars) override { m_handler->characters(aChars); } virtual void SAL_CALL - ignorableWhitespace(const OUString& aWhitespaces) throw (css::xml::sax::SAXException, - css::uno::RuntimeException, std::exception) override + ignorableWhitespace(const OUString& aWhitespaces) override { m_handler->ignorableWhitespace(aWhitespaces); } virtual void SAL_CALL - processingInstruction(const OUString& aTarget, const OUString& aData) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + processingInstruction(const OUString& aTarget, const OUString& aData) override { m_handler->processingInstruction(aTarget, aData); } virtual void SAL_CALL - setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override { m_handler->setDocumentLocator(xLocator); } @@ -120,81 +114,74 @@ namespace sax public: // XDocumentHandler virtual void SAL_CALL - startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + startDocument() override { m_handler->startDocument(); } virtual void SAL_CALL - endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + endDocument() override { m_handler->endDocument(); } virtual void SAL_CALL startElement(const OUString& aName, - const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) override { m_handler->startElement(aName, xAttribs); } virtual void SAL_CALL - endElement(const OUString& aName) throw (css::xml::sax::SAXException, - css::uno::RuntimeException, std::exception) override + endElement(const OUString& aName) override { m_handler->endElement(aName); } virtual void SAL_CALL - characters(const OUString& aChars) throw (css::xml::sax::SAXException, - css::uno::RuntimeException, std::exception) override + characters(const OUString& aChars) override { m_handler->characters(aChars); } virtual void SAL_CALL - ignorableWhitespace(const OUString& aWhitespaces) throw (css::xml::sax::SAXException, - css::uno::RuntimeException, std::exception) override + ignorableWhitespace(const OUString& aWhitespaces) override { m_handler->ignorableWhitespace(aWhitespaces); } virtual void SAL_CALL - processingInstruction(const OUString& aTarget, const OUString& aData) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + processingInstruction(const OUString& aTarget, const OUString& aData) override { m_handler->processingInstruction(aTarget, aData); } virtual void SAL_CALL - setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override { m_handler->setDocumentLocator(xLocator); } // XExtendedDocumentHandler virtual void SAL_CALL - startCDATA() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + startCDATA() override { m_handler->startCDATA(); } virtual void SAL_CALL - endCDATA() throw (css::uno::RuntimeException, std::exception) override + endCDATA() override { m_handler->endCDATA(); } virtual void SAL_CALL - comment(const OUString& sComment) throw (css::xml::sax::SAXException, - css::uno::RuntimeException, std::exception) override + comment(const OUString& sComment) override { m_handler->comment(sComment); } virtual void SAL_CALL - unknown(const OUString& sString) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + unknown(const OUString& sString) override { m_handler->unknown(sString); } virtual void SAL_CALL - allowLineBreak() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override + allowLineBreak() override { m_handler->allowLineBreak(); } |