diff options
Diffstat (limited to 'sax/source/expatwrap/sax_expat.cxx')
-rw-r--r-- | sax/source/expatwrap/sax_expat.cxx | 62 |
1 files changed, 23 insertions, 39 deletions
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 9330749185f4..ec53ee80edc8 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -107,30 +107,22 @@ public: SaxExpatParser(); // 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; // The SAX-Parser-Interface - virtual void SAL_CALL parseStream( const InputSource& structSource) - throw ( SAXException, - IOException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDocumentHandler(const css::uno::Reference< XDocumentHandler > & xHandler) - throw (css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL setErrorHandler(const css::uno::Reference< XErrorHandler > & xHandler) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDTDHandler(const css::uno::Reference < XDTDHandler > & xHandler) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEntityResolver(const css::uno::Reference< XEntityResolver >& xResolver) - throw (css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL setLocale( const Locale &locale ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL parseStream( const InputSource& structSource) override; + virtual void SAL_CALL setDocumentHandler(const css::uno::Reference< XDocumentHandler > & xHandler) override; + + virtual void SAL_CALL setErrorHandler(const css::uno::Reference< XErrorHandler > & xHandler) override; + virtual void SAL_CALL setDTDHandler(const css::uno::Reference < XDTDHandler > & xHandler) override; + virtual void SAL_CALL setEntityResolver(const css::uno::Reference< XEntityResolver >& xResolver) override; + + virtual void SAL_CALL setLocale( const Locale &locale ) override; public: // XServiceInfo - OUString SAL_CALL getImplementationName() throw (std::exception) override; - css::uno::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; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; private: std::unique_ptr<SaxExpatParser_Impl> m_pImpl; @@ -323,33 +315,33 @@ public: } public: //XLocator - virtual sal_Int32 SAL_CALL getColumnNumber() throw (std::exception) override + virtual sal_Int32 SAL_CALL getColumnNumber() override { return XML_GetCurrentColumnNumber( m_pParser->getEntity().pParser ); } - virtual sal_Int32 SAL_CALL getLineNumber() throw (std::exception) override + virtual sal_Int32 SAL_CALL getLineNumber() override { return XML_GetCurrentLineNumber( m_pParser->getEntity().pParser ); } - virtual OUString SAL_CALL getPublicId() throw (std::exception) override + virtual OUString SAL_CALL getPublicId() override { return m_pParser->getEntity().structSource.sPublicId; } - virtual OUString SAL_CALL getSystemId() throw (std::exception) override + virtual OUString SAL_CALL getSystemId() override { return m_pParser->getEntity().structSource.sSystemId; } // XSeekable (only for getPosition) - virtual void SAL_CALL seek( sal_Int64 ) throw(std::exception) override + virtual void SAL_CALL seek( sal_Int64 ) override { } - virtual sal_Int64 SAL_CALL getPosition() throw(std::exception) override + virtual sal_Int64 SAL_CALL getPosition() override { return XML_GetCurrentByteIndex( m_pParser->getEntity().pParser ); } - virtual ::sal_Int64 SAL_CALL getLength() throw(std::exception) override + virtual ::sal_Int64 SAL_CALL getLength() override { return 0; } @@ -378,7 +370,6 @@ SaxExpatParser::SaxExpatParser( ) // css::lang::XInitialization: void SAL_CALL SaxExpatParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments) - throw (css::uno::RuntimeException, css::uno::Exception, std::exception) { // possible arguments: a string "DoSmeplease" if (rArguments.getLength()) @@ -399,9 +390,6 @@ SaxExpatParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments * ****************/ void SaxExpatParser::parseStream( const InputSource& structSource) - throw (SAXException, - IOException, - css::uno::RuntimeException, std::exception) { // Only one text at one time MutexGuard guard( m_pImpl->aMutex ); @@ -509,7 +497,6 @@ void SaxExpatParser::parseStream( const InputSource& structSource) } void SaxExpatParser::setDocumentHandler(const css::uno::Reference< XDocumentHandler > & xHandler) - throw (css::uno::RuntimeException, std::exception) { m_pImpl->rDocumentHandler = xHandler; m_pImpl->rExtendedDocumentHandler = @@ -517,43 +504,40 @@ void SaxExpatParser::setDocumentHandler(const css::uno::Reference< XDocumentHand } void SaxExpatParser::setErrorHandler(const css::uno::Reference< XErrorHandler > & xHandler) - throw (css::uno::RuntimeException, std::exception) { m_pImpl->rErrorHandler = xHandler; } void SaxExpatParser::setDTDHandler(const css::uno::Reference< XDTDHandler > & xHandler) - throw (css::uno::RuntimeException, std::exception) { m_pImpl->rDTDHandler = xHandler; } void SaxExpatParser::setEntityResolver(const css::uno::Reference < XEntityResolver > & xResolver) - throw (css::uno::RuntimeException, std::exception) { m_pImpl->rEntityResolver = xResolver; } -void SaxExpatParser::setLocale( const Locale & locale ) throw (css::uno::RuntimeException, std::exception) +void SaxExpatParser::setLocale( const Locale & locale ) { m_pImpl->locale = locale; } // XServiceInfo -OUString SaxExpatParser::getImplementationName() throw (std::exception) +OUString SaxExpatParser::getImplementationName() { return OUString("com.sun.star.comp.extensions.xml.sax.ParserExpat"); } // XServiceInfo -sal_Bool SaxExpatParser::supportsService(const OUString& ServiceName) throw (std::exception) +sal_Bool SaxExpatParser::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -css::uno::Sequence< OUString > SaxExpatParser::getSupportedServiceNames() throw (std::exception) +css::uno::Sequence< OUString > SaxExpatParser::getSupportedServiceNames() { css::uno::Sequence<OUString> seq { "com.sun.star.xml.sax.Parser" }; return seq; |