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 /unoxml | |
| 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 'unoxml')
63 files changed, 820 insertions, 1556 deletions
diff --git a/unoxml/inc/node.hxx b/unoxml/inc/node.hxx index 8a1b2d8fb781..e33178a074a0 100644 --- a/unoxml/inc/node.hxx +++ b/unoxml/inc/node.hxx @@ -144,128 +144,108 @@ namespace DOM Adds the node newChild to the end of the list of children of this node. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - appendChild(css::uno::Reference< css::xml::dom::XNode > const& xNewChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + appendChild(css::uno::Reference< css::xml::dom::XNode > const& xNewChild) override; /** Returns a duplicate of this node, i.e., serves as a generic copy constructor for nodes. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override; /** A NamedNodeMap containing the attributes of this node (if it is an Element) or null otherwise. */ - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override; /** A NodeList that contains all children of this node. */ - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override; /** The first child of this node. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override; /** The last child of this node. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override; /** Returns the local part of the qualified name of this node. */ - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLocalName() override; /** The namespace URI of this node, or null if it is unspecified. */ - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNamespaceURI() override; /** The node immediately following this node. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override; /** The name of this node, depending on its type; see the table above. -- virtual implemented by actual node types */ - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; /** A code representing the type of the underlying object, as defined above. */ - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override; /** The value of this node, depending on its type; see the table above. -- virtual implemented by actual node types */ - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeValue() override; /** The Document object associated with this node. */ - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override; /** The parent of this node. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override; /** The namespace prefix of this node, or null if it is unspecified. */ - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPrefix() override; /** The node immediately preceding this node. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override; /** Returns whether this node (if it is an element) has any attributes. */ - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasAttributes() override; /** Returns whether this node has any children. */ - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasChildNodes() override; /** Inserts the node newChild before the existing child node refChild. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override; /** Tests whether the DOM implementation implements a specific feature and that feature is supported by this node. */ - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override; /** Puts all Text nodes in the full depth of the sub-tree underneath this @@ -274,55 +254,46 @@ namespace DOM entity references) separates Text nodes, i.e., there are neither adjacent Text nodes nor empty Text nodes. */ - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL normalize() override; /** Removes the child node indicated by oldChild from the list of children, and returns it. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override; /** Replaces the child node oldChild with newChild in the list of children, and returns the oldChild node. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override; /** The value of this node, depending on its type; see the table above. */ - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override; /** The namespace prefix of this node, or null if it is unspecified. */ - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL setPrefix(const OUString& prefix) override; // --- XEventTarget virtual void SAL_CALL addEventListener(const OUString& eventType, const css::uno::Reference< css::xml::dom::events::XEventListener >& listener, - sal_Bool useCapture) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool useCapture) override; virtual void SAL_CALL removeEventListener(const OUString& eventType, const css::uno::Reference< css::xml::dom::events::XEventListener >& listener, - sal_Bool useCapture) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool useCapture) override; - virtual sal_Bool SAL_CALL dispatchEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt) - throw(css::uno::RuntimeException, css::xml::dom::events::EventException, std::exception) override; + virtual sal_Bool SAL_CALL dispatchEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt) override; // --- XUnoTunnel virtual ::sal_Int64 SAL_CALL - getSomething(css::uno::Sequence< ::sal_Int8 > const& rId) - throw (css::uno::RuntimeException, std::exception) override; + getSomething(css::uno::Sequence< ::sal_Int8 > const& rId) override; }; /// eliminate redundant namespace declarations diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx index bc7ff57c2234..ce7b88393d6c 100644 --- a/unoxml/qa/unit/domtest.cxx +++ b/unoxml/qa/unit/domtest.cxx @@ -100,17 +100,17 @@ struct ErrorHandler ErrorHandler() : mnErrCount(0), mnFatalCount(0), mnWarnCount(0) {} - virtual void SAL_CALL error( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual void SAL_CALL error( const uno::Any& ) override { ++mnErrCount; } - virtual void SAL_CALL fatalError( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual void SAL_CALL fatalError( const uno::Any& ) override { ++mnFatalCount; } - virtual void SAL_CALL warning( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual void SAL_CALL warning( const uno::Any& ) override { ++mnWarnCount; } @@ -120,7 +120,7 @@ struct DocumentHandler : public ::cppu::WeakImplHelper< xml::sax::XFastDocumentHandler > { // XFastContextHandler - virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList >& ) override { SAL_INFO( "unoxml", @@ -128,42 +128,42 @@ struct DocumentHandler << (Element & 0xFFFF0000)); } - virtual void SAL_CALL startUnknownElement( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual void SAL_CALL startUnknownElement( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) override { } - virtual void SAL_CALL endFastElement( ::sal_Int32 ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual void SAL_CALL endFastElement( ::sal_Int32 ) override { } - virtual void SAL_CALL endUnknownElement( const OUString&, const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual void SAL_CALL endUnknownElement( const OUString&, const OUString& ) override { } - virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 , const uno::Reference< xml::sax::XFastAttributeList >& ) override { return this; } - virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) override { return this; } - virtual void SAL_CALL characters( const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual void SAL_CALL characters( const OUString& ) override { } // XFastDocumentHandler - virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual void SAL_CALL startDocument( ) override { } - virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual void SAL_CALL endDocument( ) override { } - virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException) override + virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) override { } }; @@ -171,12 +171,12 @@ struct DocumentHandler struct TokenHandler : public ::cppu::WeakImplHelper< xml::sax::XFastTokenHandler > { - virtual ::sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence< ::sal_Int8 >& Identifier ) throw (uno::RuntimeException) override + virtual ::sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence< ::sal_Int8 >& Identifier ) override { return Identifier.getLength() ? Identifier[0] : 0; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getUTF8Identifier( ::sal_Int32 ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getUTF8Identifier( ::sal_Int32 ) override { CPPUNIT_ASSERT_MESSAGE( "TokenHandler::getUTF8Identifier() unexpected call", false ); diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index ed2a87ccbdd6..9f0f7c8c5b67 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -81,17 +81,14 @@ namespace DOM } OUString SAL_CALL CAttr::getNodeName() - throw (RuntimeException, std::exception) { return getName(); } OUString SAL_CALL CAttr::getNodeValue() - throw (RuntimeException, std::exception) { return getValue(); } OUString SAL_CALL CAttr::getLocalName() - throw (RuntimeException, std::exception) { return getName(); } @@ -100,7 +97,7 @@ namespace DOM /** Returns the name of this attribute. */ - OUString SAL_CALL CAttr::getName() throw (RuntimeException, std::exception) + OUString SAL_CALL CAttr::getName() { ::osl::MutexGuard const g(m_rMutex); @@ -117,7 +114,6 @@ namespace DOM attribute is not in use. */ Reference< XElement > SAL_CALL CAttr::getOwnerElement() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -139,7 +135,6 @@ namespace DOM document, this is true; otherwise, it is false. */ sal_Bool SAL_CALL CAttr::getSpecified() - throw (RuntimeException, std::exception) { // FIXME if this DOM implementation supported DTDs it would need // to check that this attribute is not default or something @@ -150,7 +145,6 @@ namespace DOM On retrieval, the value of the attribute is returned as a string. */ OUString SAL_CALL CAttr::getValue() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -171,7 +165,6 @@ namespace DOM Sets the value of the attribute from a string. */ void SAL_CALL CAttr::setValue(const OUString& value) - throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -218,7 +211,6 @@ namespace DOM } void SAL_CALL CAttr::setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -234,7 +226,6 @@ namespace DOM } OUString SAL_CALL CAttr::getPrefix() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -251,7 +242,6 @@ namespace DOM } OUString SAL_CALL CAttr::getNamespaceURI() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); diff --git a/unoxml/source/dom/attr.hxx b/unoxml/source/dom/attr.hxx index 2dfbe6d64b4e..cc0f2d94071b 100644 --- a/unoxml/source/dom/attr.hxx +++ b/unoxml/source/dom/attr.hxx @@ -61,144 +61,119 @@ namespace DOM /** Returns the name of this attribute. */ - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; /** The Element node this attribute is attached to or null if this attribute is not in use. */ - virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getOwnerElement() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getOwnerElement() override; /** If this attribute was explicitly given a value in the original document, this is true; otherwise, it is false. */ - virtual sal_Bool SAL_CALL getSpecified()throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getSpecified() override; /** On retrieval, the value of the attribute is returned as a string. */ - virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getValue() override; /** Sets the value of the attribute from a string. */ - virtual void SAL_CALL setValue(const OUString& value) throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL setValue(const OUString& value) override; // resolve uno inheritance problems... // overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; + virtual OUString SAL_CALL getNodeValue() override; + virtual OUString SAL_CALL getLocalName() override; // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CNode::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CNode::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CNode::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CNode::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CNode::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CNode::getLastChild(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CNode::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CNode::getNodeType(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CNode::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CNode::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CNode::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CNode::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CNode::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CNode::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CNode::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CNode::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return setValue(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL setPrefix(const OUString& prefix) override; }; } diff --git a/unoxml/source/dom/attributesmap.cxx b/unoxml/source/dom/attributesmap.cxx index 921c085fbca3..88b386196c80 100644 --- a/unoxml/source/dom/attributesmap.cxx +++ b/unoxml/source/dom/attributesmap.cxx @@ -39,7 +39,7 @@ namespace DOM /** The number of nodes in this map. */ - sal_Int32 SAL_CALL CAttributesMap::getLength() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CAttributesMap::getLength() { ::osl::MutexGuard const g(m_rMutex); @@ -61,7 +61,7 @@ namespace DOM Retrieves a node specified by local name */ Reference< XNode > SAL_CALL - CAttributesMap::getNamedItem(OUString const& name) throw (RuntimeException, std::exception) + CAttributesMap::getNamedItem(OUString const& name) { ::osl::MutexGuard const g(m_rMutex); @@ -92,7 +92,6 @@ namespace DOM Reference< XNode > SAL_CALL CAttributesMap::getNamedItemNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -126,7 +125,7 @@ namespace DOM Returns the indexth item in the map. */ Reference< XNode > SAL_CALL - CAttributesMap::item(sal_Int32 index) throw (RuntimeException, std::exception) + CAttributesMap::item(sal_Int32 index) { ::osl::MutexGuard const g(m_rMutex); @@ -156,7 +155,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CAttributesMap::removeNamedItem(OUString const& name) - throw (DOMException, RuntimeException, std::exception) { // no MutexGuard needed: m_pElement is const Reference< XAttr > const xAttr(m_pElement->getAttributeNode(name)); @@ -177,7 +175,6 @@ namespace DOM Reference< XNode > SAL_CALL CAttributesMap::removeNamedItemNS( OUString const& namespaceURI, OUString const& localName) - throw (DOMException, RuntimeException, std::exception) { // no MutexGuard needed: m_pElement is const Reference< XAttr > const xAttr( @@ -198,7 +195,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CAttributesMap::setNamedItem(Reference< XNode > const& xNode) - throw (DOMException, RuntimeException, std::exception) { Reference< XAttr > const xAttr(xNode, UNO_QUERY); if (!xNode.is()) { @@ -218,7 +214,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CAttributesMap::setNamedItemNS(Reference< XNode > const& xNode) - throw (DOMException, RuntimeException, std::exception) { Reference< XAttr > const xAttr(xNode, UNO_QUERY); if (!xNode.is()) { diff --git a/unoxml/source/dom/attributesmap.hxx b/unoxml/source/dom/attributesmap.hxx index 38a11fb069cc..84255fd048b4 100644 --- a/unoxml/source/dom/attributesmap.hxx +++ b/unoxml/source/dom/attributesmap.hxx @@ -47,54 +47,47 @@ namespace DOM /** The number of nodes in this map. */ - virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLength() override; /** Retrieves a node specified by local name */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItem(OUString const& name) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItem(OUString const& name) override; /** Retrieves a node specified by local name and namespace URI. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItemNS( - OUString const& namespaceURI, OUString const& localName) - throw (css::uno::RuntimeException, std::exception) override; + OUString const& namespaceURI, OUString const& localName) override; /** Returns the indexth item in the map. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) override; /** Removes a node specified by name. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - removeNamedItem(OUString const& name) - throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override; + removeNamedItem(OUString const& name) override; /** // Removes a node specified by local name and namespace URI. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeNamedItemNS( - OUString const& namespaceURI, OUString const& localName) - throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override; + OUString const& namespaceURI, OUString const& localName) override; /** // Adds a node using its nodeName attribute. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg) - throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override; + setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg) override; /** Adds a node using its namespaceURI and localName. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg) - throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override; + setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg) override; }; } diff --git a/unoxml/source/dom/cdatasection.cxx b/unoxml/source/dom/cdatasection.cxx index a1c7550513e1..bd02fbd11a66 100644 --- a/unoxml/source/dom/cdatasection.cxx +++ b/unoxml/source/dom/cdatasection.cxx @@ -46,12 +46,12 @@ namespace DOM } } - OUString SAL_CALL CCDATASection::getNodeName()throw (RuntimeException, std::exception) + OUString SAL_CALL CCDATASection::getNodeName() { return OUString( "#cdata-section" ); } - OUString SAL_CALL CCDATASection::getNodeValue() throw (RuntimeException, std::exception) + OUString SAL_CALL CCDATASection::getNodeValue() { return CCharacterData::getData(); } diff --git a/unoxml/source/dom/cdatasection.hxx b/unoxml/source/dom/cdatasection.hxx index 8fb6fb98a95e..fdd0a87b2a54 100644 --- a/unoxml/source/dom/cdatasection.hxx +++ b/unoxml/source/dom/cdatasection.hxx @@ -44,174 +44,142 @@ namespace DOM virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) override; - virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL splitText(sal_Int32 offset) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL splitText(sal_Int32 offset) override { return CText::splitText(offset); } // --- delegations for XCharacterData - virtual void SAL_CALL appendData(const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL appendData(const OUString& arg) override { CCharacterData::appendData(arg); } - virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) override { CCharacterData::deleteData(offset, count); } - virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getData() override { return CCharacterData::getData(); } - virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getLength() override { return CCharacterData::getLength(); } - virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) override { CCharacterData::insertData(offset, arg); } - virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) override { CCharacterData::replaceData(offset, count, arg); } - virtual void SAL_CALL setData(const OUString& data) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setData(const OUString& data) override { CCharacterData::setData(data); } - virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) override { return CCharacterData::subStringData(offset, count); } // --- overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; + virtual OUString SAL_CALL getNodeValue() override; // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CNode::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CNode::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CNode::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CNode::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CNode::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CNode::getLastChild(); } - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLocalName() override { return CNode::getLocalName(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CNode::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CNode::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CNode::getNodeType(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CNode::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CNode::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CNode::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CNode::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CNode::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CNode::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CNode::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CNode::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CNode::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return CText::setNodeValue(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx index fea48292663c..e5fa6c7db74b 100644 --- a/unoxml/source/dom/characterdata.cxx +++ b/unoxml/source/dom/characterdata.cxx @@ -61,7 +61,6 @@ namespace DOM Append the string to the end of the character data of the node. */ void SAL_CALL CCharacterData::appendData(const OUString& arg) - throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -80,7 +79,6 @@ namespace DOM Remove a range of 16-bit units from the node. */ void SAL_CALL CCharacterData::deleteData(sal_Int32 offset, sal_Int32 count) - throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -114,7 +112,7 @@ namespace DOM /** Return the character data of the node that implements this interface. */ - OUString SAL_CALL CCharacterData::getData() throw (RuntimeException, std::exception) + OUString SAL_CALL CCharacterData::getData() { ::osl::MutexGuard const g(m_rMutex); @@ -134,7 +132,7 @@ namespace DOM The number of 16-bit units that are available through data and the substringData method below. */ - sal_Int32 SAL_CALL CCharacterData::getLength() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CCharacterData::getLength() { ::osl::MutexGuard const g(m_rMutex); @@ -151,7 +149,6 @@ namespace DOM Insert a string at the specified 16-bit unit offset. */ void SAL_CALL CCharacterData::insertData(sal_Int32 offset, const OUString& arg) - throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -186,7 +183,6 @@ namespace DOM with the specified string. */ void SAL_CALL CCharacterData::replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) - throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -221,7 +217,6 @@ namespace DOM Set the character data of the node that implements this interface. */ void SAL_CALL CCharacterData::setData(const OUString& data) - throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -240,7 +235,6 @@ namespace DOM Extracts a range of data from the node. */ OUString SAL_CALL CCharacterData::subStringData(sal_Int32 offset, sal_Int32 count) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); diff --git a/unoxml/source/dom/characterdata.hxx b/unoxml/source/dom/characterdata.hxx index 54c8e1ab16d9..8a3179d3de77 100644 --- a/unoxml/source/dom/characterdata.hxx +++ b/unoxml/source/dom/characterdata.hxx @@ -52,176 +52,145 @@ namespace DOM /** Append the string to the end of the character data of the node. */ - virtual void SAL_CALL appendData(const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL appendData(const OUString& arg) override; /** Remove a range of 16-bit units from the node. */ - virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) override; /** Return the character data of the node that implements this interface. */ - virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getData() override; /** The number of 16-bit units that are available through data and the substringData method below. */ - virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLength() override; /** Insert a string at the specified 16-bit unit offset. */ - virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) override; /** Replace the characters starting at the specified 16-bit unit offset with the specified string. */ - virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) override; /** Set the character data of the node that implements this interface. */ - virtual void SAL_CALL setData(const OUString& data) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL setData(const OUString& data) override; /** Extracts a range of data from the node. */ - virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) override; // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CNode::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CNode::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CNode::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CNode::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CNode::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CNode::getLastChild(); } - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLocalName() override { return CNode::getLocalName(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CNode::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CNode::getNextSibling(); } - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNodeName() override { return CNode::getNodeName(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CNode::getNodeType(); } - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNodeValue() override { return getData(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CNode::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CNode::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CNode::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CNode::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CNode::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CNode::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CNode::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CNode::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CNode::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return setData(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/childlist.cxx b/unoxml/source/dom/childlist.cxx index d301d7aa9a59..3666eeb2b0f7 100644 --- a/unoxml/source/dom/childlist.cxx +++ b/unoxml/source/dom/childlist.cxx @@ -39,7 +39,7 @@ namespace DOM /** The number of nodes in the list. */ - sal_Int32 SAL_CALL CChildList::getLength() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CChildList::getLength() { ::osl::MutexGuard const g(m_rMutex); @@ -63,7 +63,6 @@ namespace DOM Returns the indexth item in the collection. */ Reference< XNode > SAL_CALL CChildList::item(sal_Int32 index) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); diff --git a/unoxml/source/dom/childlist.hxx b/unoxml/source/dom/childlist.hxx index 91daba41eb7f..24f833eff749 100644 --- a/unoxml/source/dom/childlist.hxx +++ b/unoxml/source/dom/childlist.hxx @@ -47,12 +47,11 @@ namespace DOM /** The number of nodes in the list. */ - virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLength() override; /** Returns the indexth item in the collection. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) override; }; } diff --git a/unoxml/source/dom/comment.cxx b/unoxml/source/dom/comment.cxx index b6a1da8a9221..740e4813b886 100644 --- a/unoxml/source/dom/comment.cxx +++ b/unoxml/source/dom/comment.cxx @@ -42,12 +42,12 @@ namespace DOM } } - OUString SAL_CALL CComment::getNodeName()throw (RuntimeException, std::exception) + OUString SAL_CALL CComment::getNodeName() { return OUString("#comment"); } - OUString SAL_CALL CComment::getNodeValue() throw (RuntimeException, std::exception) + OUString SAL_CALL CComment::getNodeValue() { return CCharacterData::getData(); } diff --git a/unoxml/source/dom/comment.hxx b/unoxml/source/dom/comment.hxx index 4cf3cd2637a5..3ce9362606f4 100644 --- a/unoxml/source/dom/comment.hxx +++ b/unoxml/source/dom/comment.hxx @@ -46,167 +46,136 @@ namespace DOM virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) override; // --- delegations for XCharacterData - virtual void SAL_CALL appendData(const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL appendData(const OUString& arg) override { CCharacterData::appendData(arg); } - virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) override { CCharacterData::deleteData(offset, count); } - virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getData() override { return CCharacterData::getData(); } - virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getLength() override { return CCharacterData::getLength(); } - virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) override { CCharacterData::insertData(offset, arg); } - virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) override { CCharacterData::replaceData(offset, count, arg); } - virtual void SAL_CALL setData(const OUString& data) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setData(const OUString& data) override { CCharacterData::setData(data); } - virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) override { return CCharacterData::subStringData(offset, count); } // --- overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; + virtual OUString SAL_CALL getNodeValue() override; // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CCharacterData::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CCharacterData::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CCharacterData::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CCharacterData::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CCharacterData::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CCharacterData::getLastChild(); } - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLocalName() override { return CCharacterData::getLocalName(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CCharacterData::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CCharacterData::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CCharacterData::getNodeType(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CCharacterData::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CCharacterData::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CCharacterData::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CCharacterData::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CCharacterData::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CCharacterData::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CCharacterData::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CCharacterData::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CCharacterData::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CCharacterData::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CCharacterData::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return CCharacterData::setNodeValue(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CCharacterData::setPrefix(prefix); } diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index 8c0b25d2ffc5..9911c33e9ab2 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -325,7 +325,6 @@ namespace DOM void SAL_CALL CDocument::addListener(const Reference< XStreamListener >& aListener ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -333,7 +332,6 @@ namespace DOM } void SAL_CALL CDocument::removeListener(const Reference< XStreamListener >& aListener ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -370,7 +368,6 @@ namespace DOM } // extern "C" void SAL_CALL CDocument::start() - throw (RuntimeException, std::exception) { listenerlist_t streamListeners; { @@ -411,20 +408,18 @@ namespace DOM } void SAL_CALL CDocument::terminate() - throw (RuntimeException, std::exception) { // not supported } void SAL_CALL CDocument::setOutputStream( const Reference< XOutputStream >& aStream ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); m_rOutputStream = aStream; } - Reference< XOutputStream > SAL_CALL CDocument::getOutputStream() throw (RuntimeException, std::exception) + Reference< XOutputStream > SAL_CALL CDocument::getOutputStream() { ::osl::MutexGuard const g(m_Mutex); @@ -433,7 +428,6 @@ namespace DOM // Creates an Attr of the given name. Reference< XAttr > SAL_CALL CDocument::createAttribute(const OUString& name) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -451,7 +445,6 @@ namespace DOM // Creates an attribute of the given qualified name and namespace URI. Reference< XAttr > SAL_CALL CDocument::createAttributeNS( const OUString& ns, const OUString& qname) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -486,7 +479,6 @@ namespace DOM // Creates a CDATASection node whose value is the specified string. Reference< XCDATASection > SAL_CALL CDocument::createCDATASection(const OUString& data) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -504,7 +496,6 @@ namespace DOM // Creates a Comment node given the specified string. Reference< XComment > SAL_CALL CDocument::createComment(const OUString& data) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -519,7 +510,6 @@ namespace DOM //Creates an empty DocumentFragment object. Reference< XDocumentFragment > SAL_CALL CDocument::createDocumentFragment() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -532,7 +522,6 @@ namespace DOM // Creates an element of the type specified. Reference< XElement > SAL_CALL CDocument::createElement(const OUString& tagName) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -548,7 +537,6 @@ namespace DOM // Creates an element of the given qualified name and namespace URI. Reference< XElement > SAL_CALL CDocument::createElementNS( const OUString& ns, const OUString& qname) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -584,7 +572,6 @@ namespace DOM //Creates an EntityReference object. Reference< XEntityReference > SAL_CALL CDocument::createEntityReference(const OUString& name) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -601,7 +588,6 @@ namespace DOM // data strings. Reference< XProcessingInstruction > SAL_CALL CDocument::createProcessingInstruction( const OUString& target, const OUString& data) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -619,7 +605,6 @@ namespace DOM // Creates a Text node given the specified string. Reference< XText > SAL_CALL CDocument::createTextNode(const OUString& data) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -635,7 +620,6 @@ namespace DOM // The Document Type Declaration (see DocumentType) associated with this // document. Reference< XDocumentType > SAL_CALL CDocument::getDoctype() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -649,7 +633,6 @@ namespace DOM // This is a convenience attribute that allows direct access to the child // node that is the root element of the document. Reference< XElement > SAL_CALL CDocument::getDocumentElement() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -690,7 +673,6 @@ namespace DOM // Returns the Element whose ID is given by elementId. Reference< XElement > SAL_CALL CDocument::getElementById(const OUString& elementId) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -709,7 +691,6 @@ namespace DOM Reference< XNodeList > SAL_CALL CDocument::getElementsByTagName(OUString const& rTagname) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -720,7 +701,6 @@ namespace DOM Reference< XNodeList > SAL_CALL CDocument::getElementsByTagNameNS( OUString const& rNamespaceURI, OUString const& rLocalName) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -731,7 +711,6 @@ namespace DOM } Reference< XDOMImplementation > SAL_CALL CDocument::getImplementation() - throw (RuntimeException, std::exception) { // does not need mutex currently return Reference< XDOMImplementation >(CDOMImplementation::get()); @@ -916,7 +895,6 @@ namespace DOM Reference< XNode > SAL_CALL CDocument::importNode( Reference< XNode > const& xImportedNode, sal_Bool deep) - throw (RuntimeException, DOMException, std::exception) { if (!xImportedNode.is()) { throw RuntimeException(); } @@ -945,20 +923,19 @@ namespace DOM return xNode; } - OUString SAL_CALL CDocument::getNodeName()throw (RuntimeException, std::exception) + OUString SAL_CALL CDocument::getNodeName() { // does not need mutex currently return OUString("#document"); } - OUString SAL_CALL CDocument::getNodeValue() throw (RuntimeException, std::exception) + OUString SAL_CALL CDocument::getNodeValue() { // does not need mutex currently return OUString(); } Reference< XNode > SAL_CALL CDocument::cloneNode(sal_Bool bDeep) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -973,7 +950,7 @@ namespace DOM return xRet; } - Reference< XEvent > SAL_CALL CDocument::createEvent(const OUString& aType) throw (RuntimeException, std::exception) + Reference< XEvent > SAL_CALL CDocument::createEvent(const OUString& aType) { // does not need mutex currently events::CEvent *pEvent = nullptr; @@ -1002,7 +979,6 @@ namespace DOM void SAL_CALL CDocument::serialize( const Reference< XDocumentHandler >& i_xHandler, const Sequence< beans::StringPair >& i_rNamespaces) - throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -1031,7 +1007,6 @@ namespace DOM const Reference< XFastTokenHandler >& i_xTokenHandler, const Sequence< beans::StringPair >& i_rNamespaces, const Sequence< beans::Pair< OUString, sal_Int32 > >& i_rRegisterNamespaces ) - throw (SAXException, RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx index fce0514b62a9..8d1fcd8fa587 100644 --- a/unoxml/source/dom/document.hxx +++ b/unoxml/source/dom/document.hxx @@ -118,246 +118,204 @@ namespace DOM /** Creates an Attr of the given name. */ - virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL createAttribute(const OUString& name) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL createAttribute(const OUString& name) override; /** Creates an attribute of the given qualified name and namespace URI. */ - virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL createAttributeNS(const OUString& namespaceURI, const OUString& qualifiedName) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL createAttributeNS(const OUString& namespaceURI, const OUString& qualifiedName) override; /** Creates a CDATASection node whose value is the specified string. */ - virtual css::uno::Reference< css::xml::dom::XCDATASection > SAL_CALL createCDATASection(const OUString& data) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XCDATASection > SAL_CALL createCDATASection(const OUString& data) override; /** Creates a Comment node given the specified string. */ - virtual css::uno::Reference< css::xml::dom::XComment > SAL_CALL createComment(const OUString& data) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XComment > SAL_CALL createComment(const OUString& data) override; /** Creates an empty DocumentFragment object. */ - virtual css::uno::Reference< css::xml::dom::XDocumentFragment > SAL_CALL createDocumentFragment() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XDocumentFragment > SAL_CALL createDocumentFragment() override; /** Creates an element of the type specified. */ - virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL createElement(const OUString& tagName) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL createElement(const OUString& tagName) override; /** Creates an element of the given qualified name and namespace URI. */ - virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL createElementNS(const OUString& namespaceURI, const OUString& qualifiedName) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL createElementNS(const OUString& namespaceURI, const OUString& qualifiedName) override; /** Creates an EntityReference object. */ - virtual css::uno::Reference< css::xml::dom::XEntityReference > SAL_CALL createEntityReference(const OUString& name) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XEntityReference > SAL_CALL createEntityReference(const OUString& name) override; /** Creates a ProcessingInstruction node given the specified name and data strings. */ virtual css::uno::Reference< css::xml::dom::XProcessingInstruction > SAL_CALL createProcessingInstruction( - const OUString& target, const OUString& data) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + const OUString& target, const OUString& data) override; /** Creates a Text node given the specified string. */ - virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL createTextNode(const OUString& data) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL createTextNode(const OUString& data) override; /** The Document Type Declaration (see DocumentType) associated with this document. */ - virtual css::uno::Reference< css::xml::dom::XDocumentType > SAL_CALL getDoctype() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XDocumentType > SAL_CALL getDoctype() override; /** This is a convenience attribute that allows direct access to the child node that is the root element of the document. */ - virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getDocumentElement() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getDocumentElement() override; /** Returns the Element whose ID is given by elementId. */ - virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getElementById(const OUString& elementId) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getElementById(const OUString& elementId) override; /** Returns a NodeList of all the Elements with a given tag name in the order in which they are encountered in a preorder traversal of the Document tree. */ - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagName(const OUString& tagname) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagName(const OUString& tagname) override; /** Returns a NodeList of all the Elements with a given local name and namespace URI in the order in which they are encountered in a preorder traversal of the Document tree. */ - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI, const OUString& localName) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI, const OUString& localName) override; /** The DOMImplementation object that handles this document. */ - virtual css::uno::Reference< css::xml::dom::XDOMImplementation > SAL_CALL getImplementation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XDOMImplementation > SAL_CALL getImplementation() override; /** Imports a node from another document to this document. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL importNode(const css::uno::Reference< css::xml::dom::XNode >& importedNode, sal_Bool deep) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL importNode(const css::uno::Reference< css::xml::dom::XNode >& importedNode, sal_Bool deep) override; // XDocumentEvent - virtual css::uno::Reference< css::xml::dom::events::XEvent > SAL_CALL createEvent(const OUString& eventType) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::events::XEvent > SAL_CALL createEvent(const OUString& eventType) override; // XActiveDataControl, // see http://api.libreoffice.org/docs/common/ref/com/sun/star/io/XActiveDataControl.html - virtual void SAL_CALL addListener(const css::uno::Reference< css::io::XStreamListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeListener(const css::uno::Reference< css::io::XStreamListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL start() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL terminate() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addListener(const css::uno::Reference< css::io::XStreamListener >& aListener ) override; + virtual void SAL_CALL removeListener(const css::uno::Reference< css::io::XStreamListener >& aListener ) override; + virtual void SAL_CALL start() override; + virtual void SAL_CALL terminate() override; // XActiveDataSource // see http://api.libreoffice.org/docs/common/ref/com/sun/star/io/XActiveDataSource.html - virtual void SAL_CALL setOutputStream( const css::uno::Reference< css::io::XOutputStream >& aStream ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setOutputStream( const css::uno::Reference< css::io::XOutputStream >& aStream ) override; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream() override; // ---- resolve uno inheritance problems... // overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; + virtual OUString SAL_CALL getNodeValue() override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override; // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CNode::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CNode::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CNode::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CNode::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CNode::getLastChild(); } - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLocalName() override { return CNode::getLocalName(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CNode::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CNode::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CNode::getNodeType(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CNode::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CNode::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CNode::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CNode::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CNode::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CNode::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CNode::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CNode::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CNode::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return CNode::setNodeValue(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CNode::setPrefix(prefix); } @@ -365,15 +323,13 @@ namespace DOM // css::xml::sax::XSAXSerializable virtual void SAL_CALL serialize( const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler, - const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces) override; // css::xml::sax::XFastSAXSerializable virtual void SAL_CALL fastSerialize( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& handler, const css::uno::Reference< css::xml::sax::XFastTokenHandler >& tokenHandler, const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces, - const css::uno::Sequence< css::beans::Pair< OUString, sal_Int32 > >& namespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::Pair< OUString, sal_Int32 > >& namespaces ) override; }; } diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index b460004687e0..0a3e80dc9767 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -63,8 +63,7 @@ namespace DOM class CDefaultEntityResolver : public cppu::WeakImplHelper< XEntityResolver > { public: - virtual InputSource SAL_CALL resolveEntity( const OUString& sPublicId, const OUString& sSystemId ) - throw (css::uno::RuntimeException, std::exception) override + virtual InputSource SAL_CALL resolveEntity( const OUString& sPublicId, const OUString& sSystemId ) override { InputSource is; is.sPublicId = sPublicId; @@ -122,44 +121,37 @@ namespace DOM } Sequence< OUString > SAL_CALL CDocumentBuilder::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return CDocumentBuilder::_getSupportedServiceNames(); } OUString SAL_CALL CDocumentBuilder::getImplementationName() - throw (RuntimeException, std::exception) { return CDocumentBuilder::_getImplementationName(); } sal_Bool SAL_CALL CDocumentBuilder::supportsService(const OUString& aServiceName) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, aServiceName); } Reference< XDOMImplementation > SAL_CALL CDocumentBuilder::getDOMImplementation() - throw (RuntimeException, std::exception) { return Reference< XDOMImplementation >(); } sal_Bool SAL_CALL CDocumentBuilder::isNamespaceAware() - throw (RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL CDocumentBuilder::isValidating() - throw (RuntimeException, std::exception) { return false; } Reference< XDocument > SAL_CALL CDocumentBuilder::newDocument() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -308,7 +300,6 @@ namespace DOM } Reference< XDocument > SAL_CALL CDocumentBuilder::parse(const Reference< XInputStream >& is) - throw (RuntimeException, SAXParseException, IOException, std::exception) { if (!is.is()) { throw RuntimeException(); @@ -345,7 +336,6 @@ namespace DOM } Reference< XDocument > SAL_CALL CDocumentBuilder::parseURI(const OUString& sUri) - throw (RuntimeException, SAXParseException, IOException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -369,7 +359,6 @@ namespace DOM void SAL_CALL CDocumentBuilder::setEntityResolver(Reference< XEntityResolver > const& xER) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -377,7 +366,6 @@ namespace DOM } Reference< XEntityResolver > SAL_CALL CDocumentBuilder::getEntityResolver() - throw (RuntimeException) { ::osl::MutexGuard const g(m_Mutex); @@ -386,7 +374,6 @@ namespace DOM void SAL_CALL CDocumentBuilder::setErrorHandler(Reference< XErrorHandler > const& xEH) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx index 482c5ea718dc..cdda893010d5 100644 --- a/unoxml/source/dom/documentbuilder.hxx +++ b/unoxml/source/dom/documentbuilder.hxx @@ -69,72 +69,60 @@ namespace DOM rSMgr); // 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; /** Obtain an instance of a DOMImplementation object. */ - virtual css::uno::Reference< css::xml::dom::XDOMImplementation > SAL_CALL getDOMImplementation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XDOMImplementation > SAL_CALL getDOMImplementation() override; /** Indicates whether or not this parser is configured to understand namespaces. */ - virtual sal_Bool SAL_CALL isNamespaceAware() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isNamespaceAware() override; /** Indicates whether or not this parser is configured to validate XML documents. */ - virtual sal_Bool SAL_CALL isValidating() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isValidating() override; /** Obtain a new instance of a DOM Document object to build a DOM tree with. */ - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL newDocument() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL newDocument() override; /** Parse the content of the given InputStream as an XML document and return a new DOM Document object. */ - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL parse(const css::uno::Reference< css::io::XInputStream >& is) - throw (css::uno::RuntimeException, css::xml::sax::SAXParseException, css::io::IOException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL parse(const css::uno::Reference< css::io::XInputStream >& is) override; /** Parse the content of the given URI as an XML document and return a new DOM Document object. */ - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL parseURI(const OUString& uri) - throw (css::uno::RuntimeException, css::xml::sax::SAXParseException, css::io::IOException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL parseURI(const OUString& uri) override; /** Specify the EntityResolver to be used to resolve entities present in the XML document to be parsed. */ - virtual void SAL_CALL setEntityResolver(const css::uno::Reference< css::xml::sax::XEntityResolver >& er) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEntityResolver(const css::uno::Reference< css::xml::sax::XEntityResolver >& er) override; /// @throws css::uno::RuntimeException - css::uno::Reference< css::xml::sax::XEntityResolver > SAL_CALL getEntityResolver() - throw (css::uno::RuntimeException); + css::uno::Reference< css::xml::sax::XEntityResolver > SAL_CALL getEntityResolver(); /** Specify the ErrorHandler to be used to report errors present in the XML document to be parsed. */ - virtual void SAL_CALL setErrorHandler(const css::uno::Reference< css::xml::sax::XErrorHandler >& eh) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setErrorHandler(const css::uno::Reference< css::xml::sax::XErrorHandler >& eh) override; }; } diff --git a/unoxml/source/dom/documentfragment.cxx b/unoxml/source/dom/documentfragment.cxx index 9b67514809ee..82a25aba5222 100644 --- a/unoxml/source/dom/documentfragment.cxx +++ b/unoxml/source/dom/documentfragment.cxx @@ -47,11 +47,11 @@ namespace DOM } } - OUString SAL_CALL CDocumentFragment::getNodeName()throw (RuntimeException, std::exception) + OUString SAL_CALL CDocumentFragment::getNodeName() { return OUString("#document-fragment"); } - OUString SAL_CALL CDocumentFragment::getNodeValue() throw (RuntimeException, std::exception) + OUString SAL_CALL CDocumentFragment::getNodeValue() { return OUString(); } diff --git a/unoxml/source/dom/documentfragment.hxx b/unoxml/source/dom/documentfragment.hxx index 62068af0c478..8ed4481484bc 100644 --- a/unoxml/source/dom/documentfragment.hxx +++ b/unoxml/source/dom/documentfragment.hxx @@ -47,125 +47,100 @@ namespace DOM // ---- resolve uno inheritance problems... // overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; + virtual OUString SAL_CALL getNodeValue() override; // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CNode::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CNode::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CNode::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CNode::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CNode::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CNode::getLastChild(); } - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLocalName() override { return CNode::getLocalName(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CNode::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CNode::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CNode::getNodeType(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CNode::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CNode::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CNode::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CNode::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CNode::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CNode::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CNode::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CNode::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CNode::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return CNode::setNodeValue(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/documenttype.cxx b/unoxml/source/dom/documenttype.cxx index ddc32016dbe6..047f5742cd4c 100644 --- a/unoxml/source/dom/documenttype.cxx +++ b/unoxml/source/dom/documenttype.cxx @@ -45,7 +45,7 @@ namespace DOM A NamedNodeMap containing the general entities, both external and internal, declared in the DTD. */ - css::uno::Reference< XNamedNodeMap > SAL_CALL CDocumentType::getEntities() throw (RuntimeException, std::exception) + css::uno::Reference< XNamedNodeMap > SAL_CALL CDocumentType::getEntities() { ::osl::MutexGuard const g(m_rMutex); @@ -60,7 +60,7 @@ namespace DOM /** The internal subset as a string, or null if there is none. */ - OUString SAL_CALL CDocumentType::getInternalSubset() throw (RuntimeException, std::exception) + OUString SAL_CALL CDocumentType::getInternalSubset() { OSL_ENSURE(false, "CDocumentType::getInternalSubset: not implemented (#i113683#)"); @@ -71,7 +71,7 @@ namespace DOM The name of DTD; i.e., the name immediately following the DOCTYPE keyword. */ - OUString SAL_CALL CDocumentType::getName() throw (RuntimeException, std::exception) + OUString SAL_CALL CDocumentType::getName() { ::osl::MutexGuard const g(m_rMutex); @@ -86,7 +86,7 @@ namespace DOM /** A NamedNodeMap containing the notations declared in the DTD. */ - css::uno::Reference< XNamedNodeMap > SAL_CALL CDocumentType::getNotations() throw (RuntimeException, std::exception) + css::uno::Reference< XNamedNodeMap > SAL_CALL CDocumentType::getNotations() { ::osl::MutexGuard const g(m_rMutex); @@ -101,7 +101,7 @@ namespace DOM /** The public identifier of the external subset. */ - OUString SAL_CALL CDocumentType::getPublicId() throw (RuntimeException, std::exception) + OUString SAL_CALL CDocumentType::getPublicId() { ::osl::MutexGuard const g(m_rMutex); @@ -116,7 +116,7 @@ namespace DOM /** The system identifier of the external subset. */ - OUString SAL_CALL CDocumentType::getSystemId() throw (RuntimeException, std::exception) + OUString SAL_CALL CDocumentType::getSystemId() { ::osl::MutexGuard const g(m_rMutex); @@ -128,12 +128,12 @@ namespace DOM return aId; } - OUString SAL_CALL CDocumentType::getNodeName()throw (RuntimeException, std::exception) + OUString SAL_CALL CDocumentType::getNodeName() { return getName(); } - OUString SAL_CALL CDocumentType::getNodeValue() throw (RuntimeException, std::exception) + OUString SAL_CALL CDocumentType::getNodeValue() { return OUString(); } diff --git a/unoxml/source/dom/documenttype.hxx b/unoxml/source/dom/documenttype.hxx index 711f1a4e5a59..1987fb8e110d 100644 --- a/unoxml/source/dom/documenttype.hxx +++ b/unoxml/source/dom/documenttype.hxx @@ -55,155 +55,130 @@ namespace DOM A NamedNodeMap containing the general entities, both external and internal, declared in the DTD. */ - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getEntities() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getEntities() override; /** The internal subset as a string, or null if there is none. */ - virtual OUString SAL_CALL getInternalSubset() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getInternalSubset() override; /** The name of DTD; i.e., the name immediately following the DOCTYPE keyword. */ - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; /** A NamedNodeMap containing the notations declared in the DTD. */ - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getNotations() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getNotations() override; /** The public identifier of the external subset. */ - virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPublicId() override; /** The system identifier of the external subset. */ - virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSystemId() override; // ---- resolve uno inheritance problems... // overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; + virtual OUString SAL_CALL getNodeValue() override; // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CNode::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CNode::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CNode::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CNode::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CNode::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CNode::getLastChild(); } - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLocalName() override { return CNode::getLocalName(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CNode::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CNode::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CNode::getNodeType(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CNode::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CNode::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CNode::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CNode::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CNode::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CNode::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CNode::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CNode::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CNode::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return CNode::setNodeValue(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/domimplementation.cxx b/unoxml/source/dom/domimplementation.cxx index 9439320e0ca5..1bf354ced661 100644 --- a/unoxml/source/dom/domimplementation.cxx +++ b/unoxml/source/dom/domimplementation.cxx @@ -51,7 +51,6 @@ namespace DOM OUString const& /*rNamespaceURI*/, OUString const& /*rQualifiedName*/, Reference< XDocumentType > const& /*xDoctype*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CDOMImplementation::createDocument: not implemented (#i113683#)"); @@ -64,7 +63,6 @@ namespace DOM Reference< XDocumentType > SAL_CALL CDOMImplementation::createDocumentType( OUString const& /*rQualifiedName*/, OUString const& /*rPublicId*/, OUString const& /*rSystemId*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CDOMImplementation::createDocumentType: " "not implemented (#i113683#)"); @@ -76,7 +74,6 @@ namespace DOM */ sal_Bool SAL_CALL CDOMImplementation::hasFeature(OUString const& /*feature*/, OUString const& /*ver*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CDOMImplementation::hasFeature: not implemented (#i113683#)"); diff --git a/unoxml/source/dom/domimplementation.hxx b/unoxml/source/dom/domimplementation.hxx index de218640f1f1..095587409235 100644 --- a/unoxml/source/dom/domimplementation.hxx +++ b/unoxml/source/dom/domimplementation.hxx @@ -45,20 +45,17 @@ namespace DOM /** Creates a DOM Document object of the specified type with its document element. */ - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL createDocument(const OUString& namespaceURI, const OUString& qualifiedName, const css::uno::Reference< css::xml::dom::XDocumentType >& doctype) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL createDocument(const OUString& namespaceURI, const OUString& qualifiedName, const css::uno::Reference< css::xml::dom::XDocumentType >& doctype) override; /** Creates an empty DocumentType node. */ - virtual css::uno::Reference< css::xml::dom::XDocumentType > SAL_CALL createDocumentType(const OUString& qualifiedName, const OUString& publicId, const OUString& systemId) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XDocumentType > SAL_CALL createDocumentType(const OUString& qualifiedName, const OUString& publicId, const OUString& systemId) override; /** Test if the DOM implementation implements a specific feature. */ - virtual sal_Bool SAL_CALL hasFeature(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasFeature(const OUString& feature, const OUString& ver) override; }; } #endif diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index 4933f89baf3c..ed81e8d2333f 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -231,7 +231,6 @@ namespace DOM return empty string if attribute is not set */ OUString SAL_CALL CElement::getAttribute(OUString const& name) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -254,7 +253,6 @@ namespace DOM Retrieves an attribute node by name. */ Reference< XAttr > SAL_CALL CElement::getAttributeNode(OUString const& name) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -280,7 +278,6 @@ namespace DOM */ Reference< XAttr > SAL_CALL CElement::getAttributeNodeNS( const OUString& namespaceURI, const OUString& localName) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -311,7 +308,6 @@ namespace DOM OUString SAL_CALL CElement::getAttributeNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -342,7 +338,6 @@ namespace DOM */ Reference< XNodeList > SAL_CALL CElement::getElementsByTagName(OUString const& rLocalName) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -359,7 +354,6 @@ namespace DOM Reference< XNodeList > SAL_CALL CElement::getElementsByTagNameNS( OUString const& rNamespaceURI, OUString const& rLocalName) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -372,7 +366,6 @@ namespace DOM The name of the element. */ OUString SAL_CALL CElement::getTagName() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -390,7 +383,6 @@ namespace DOM element or has a default value, false otherwise. */ sal_Bool SAL_CALL CElement::hasAttribute(OUString const& name) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -405,7 +397,6 @@ namespace DOM */ sal_Bool SAL_CALL CElement::hasAttributeNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -420,7 +411,6 @@ namespace DOM Removes an attribute by name. */ void SAL_CALL CElement::removeAttribute(OUString const& name) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -445,7 +435,6 @@ namespace DOM */ void SAL_CALL CElement::removeAttributeNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -475,7 +464,6 @@ namespace DOM */ Reference< XAttr > SAL_CALL CElement::removeAttributeNode(Reference< XAttr > const& oldAttr) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -594,7 +582,6 @@ namespace DOM Reference< XAttr > CElement::setAttributeNode(const Reference< XAttr >& newAttr) - throw (RuntimeException, DOMException, std::exception) { return setAttributeNode_Impl_Lock(newAttr, false); } @@ -604,7 +591,6 @@ namespace DOM */ Reference< XAttr > CElement::setAttributeNodeNS(const Reference< XAttr >& newAttr) - throw (RuntimeException, DOMException, std::exception) { return setAttributeNode_Impl_Lock(newAttr, true); } @@ -614,7 +600,6 @@ namespace DOM */ void SAL_CALL CElement::setAttribute(OUString const& name, OUString const& value) - throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -660,7 +645,6 @@ namespace DOM void SAL_CALL CElement::setAttributeNS(OUString const& namespaceURI, OUString const& qualifiedName, OUString const& value) - throw (RuntimeException, DOMException, std::exception) { if (namespaceURI.isEmpty()) throw RuntimeException(); @@ -737,7 +721,7 @@ namespace DOM } Reference< XNamedNodeMap > SAL_CALL - CElement::getAttributes() throw (RuntimeException, std::exception) + CElement::getAttributes() { ::osl::MutexGuard const g(m_rMutex); @@ -746,12 +730,12 @@ namespace DOM return xMap; } - OUString SAL_CALL CElement::getNodeName()throw (RuntimeException, std::exception) + OUString SAL_CALL CElement::getNodeName() { return getLocalName(); } - OUString SAL_CALL CElement::getLocalName()throw (RuntimeException, std::exception) + OUString SAL_CALL CElement::getLocalName() { ::osl::MutexGuard const g(m_rMutex); @@ -764,7 +748,7 @@ namespace DOM return aName; } - OUString SAL_CALL CElement::getNodeValue() throw (RuntimeException, std::exception) + OUString SAL_CALL CElement::getNodeValue() { return OUString(); } diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx index e14a5de4b908..5e44f14ac8f1 100644 --- a/unoxml/source/dom/element.hxx +++ b/unoxml/source/dom/element.hxx @@ -59,34 +59,29 @@ namespace DOM /** Retrieves an attribute value by name. */ - virtual OUString SAL_CALL getAttribute(const OUString& name) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAttribute(const OUString& name) override; /** Retrieves an attribute node by name. */ - virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNode(const OUString& name) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNode(const OUString& name) override; /** Retrieves an Attr node by local name and namespace URI. */ - virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNodeNS(const OUString& namespaceURI, const OUString& localName) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNodeNS(const OUString& namespaceURI, const OUString& localName) override; /** Retrieves an attribute value by local name and namespace URI. */ - virtual OUString SAL_CALL getAttributeNS(const OUString& namespaceURI, const OUString& localName) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAttributeNS(const OUString& namespaceURI, const OUString& localName) override; /** Returns a NodeList of all descendant Elements with a given tag name, in the order in which they are encountered in a preorder traversal of this Element tree. */ - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagName(const OUString& name) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagName(const OUString& name) override; /** Returns a NodeList of all the descendant Elements with a given local @@ -94,188 +89,152 @@ namespace DOM a preorder traversal of this Element tree. */ virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI, - const OUString& localName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& localName) override; /** The name of the element. */ - virtual OUString SAL_CALL getTagName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTagName() override; /** Returns true when an attribute with a given name is specified on this element or has a default value, false otherwise. */ - virtual sal_Bool SAL_CALL hasAttribute(const OUString& name) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasAttribute(const OUString& name) override; /** Returns true when an attribute with a given local name and namespace URI is specified on this element or has a default value, false otherwise. */ - virtual sal_Bool SAL_CALL hasAttributeNS(const OUString& namespaceURI, const OUString& localName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasAttributeNS(const OUString& namespaceURI, const OUString& localName) override; /** Removes an attribute by name. */ - virtual void SAL_CALL removeAttribute(const OUString& name) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL removeAttribute(const OUString& name) override; /** Removes the specified attribute node. */ - virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL removeAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& oldAttr) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL removeAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& oldAttr) override; /** Removes an attribute by local name and namespace URI. */ - virtual void SAL_CALL removeAttributeNS(const OUString& namespaceURI, const OUString& localName) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL removeAttributeNS(const OUString& namespaceURI, const OUString& localName) override; /** Adds a new attribute. */ - virtual void SAL_CALL setAttribute(const OUString& name, const OUString& value) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL setAttribute(const OUString& name, const OUString& value) override; /** Adds a new attribute node. */ - virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& newAttr) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& newAttr) override; /** Adds a new attribute. */ - virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNodeNS(const css::uno::Reference< css::xml::dom::XAttr >& newAttr) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNodeNS(const css::uno::Reference< css::xml::dom::XAttr >& newAttr) override; /** Adds a new attribute. */ virtual void SAL_CALL setAttributeNS( - const OUString& namespaceURI, const OUString& qualifiedName, const OUString& value) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + const OUString& namespaceURI, const OUString& qualifiedName, const OUString& value) override; // overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; + virtual OUString SAL_CALL getNodeValue() override; + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override; + virtual OUString SAL_CALL getLocalName() override; // resolve uno inheritance problems... // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CNode::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CNode::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CNode::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CNode::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CNode::getLastChild(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CNode::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CNode::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CNode::getNodeType(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CNode::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CNode::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CNode::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CNode::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CNode::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CNode::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CNode::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CNode::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CNode::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return CNode::setNodeValue(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index c851faf426b3..fad086a3b604 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -44,8 +44,7 @@ namespace { } - virtual void SAL_CALL handleEvent(const css::uno::Reference<css::xml::dom::events::XEvent>& rEvent) - throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL handleEvent(const css::uno::Reference<css::xml::dom::events::XEvent>& rEvent) override { css::uno::Reference<css::xml::dom::events::XEventListener> xOwner(mxOwner.get(), css::uno::UNO_QUERY); @@ -155,7 +154,7 @@ namespace DOM /** The number of nodes in the list. */ - sal_Int32 SAL_CALL CElementListImpl::getLength() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CElementListImpl::getLength() { ::osl::MutexGuard const g(m_rMutex); @@ -169,7 +168,6 @@ namespace DOM Returns the indexth item in the collection. */ Reference< XNode > SAL_CALL CElementListImpl::item(sal_Int32 index) - throw (RuntimeException, std::exception) { if (index < 0) throw RuntimeException(); @@ -188,7 +186,6 @@ namespace DOM // tree mutations can change the list void SAL_CALL CElementListImpl::handleEvent(Reference< XEvent > const&) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); diff --git a/unoxml/source/dom/elementlist.hxx b/unoxml/source/dom/elementlist.hxx index d6ce1353019a..3f44d05a0253 100644 --- a/unoxml/source/dom/elementlist.hxx +++ b/unoxml/source/dom/elementlist.hxx @@ -75,16 +75,14 @@ namespace DOM /** The number of nodes in the list. */ - virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLength() override; /** Returns the indexth item in the collection. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) override; // XEventListener - virtual void SAL_CALL handleEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL handleEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt) override; }; class CElementList @@ -101,22 +99,20 @@ namespace DOM /** The number of nodes in the list. */ - virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getLength() override { return m_xImpl->getLength(); } /** Returns the indexth item in the collection. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) override { return m_xImpl->item(index); } // XEventListener - virtual void SAL_CALL handleEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt) - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL handleEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt) override { m_xImpl->handleEvent(evt); } diff --git a/unoxml/source/dom/entitiesmap.cxx b/unoxml/source/dom/entitiesmap.cxx index a281fa1b07ce..c75b70d9e853 100644 --- a/unoxml/source/dom/entitiesmap.cxx +++ b/unoxml/source/dom/entitiesmap.cxx @@ -35,7 +35,7 @@ namespace DOM /** The number of nodes in this map. */ - sal_Int32 SAL_CALL CEntitiesMap::getLength() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CEntitiesMap::getLength() { OSL_ENSURE(false, "CEntitiesMap::getLength: not implemented (#i113683#)"); @@ -46,7 +46,7 @@ namespace DOM Retrieves a node specified by local name */ Reference< XNode > SAL_CALL - CEntitiesMap::getNamedItem(OUString const& /*name*/) throw (RuntimeException, std::exception) + CEntitiesMap::getNamedItem(OUString const& /*name*/) { OSL_ENSURE(false, "CEntitiesMap::getNamedItem: not implemented (#i113683#)"); @@ -59,7 +59,6 @@ namespace DOM Reference< XNode > SAL_CALL CEntitiesMap::getNamedItemNS( OUString const& /*namespaceURI*/, OUString const& /*localName*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::getNamedItemNS: not implemented (#i113683#)"); @@ -70,7 +69,7 @@ namespace DOM Returns the indexth item in the map. */ Reference< XNode > SAL_CALL - CEntitiesMap::item(sal_Int32 /*index*/) throw (RuntimeException, std::exception) + CEntitiesMap::item(sal_Int32 /*index*/) { OSL_ENSURE(false, "CEntitiesMap::item: not implemented (#i113683#)"); return Reference< XNode >(); @@ -81,7 +80,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CEntitiesMap::removeNamedItem(OUString const& /*name*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::removeNamedItem: not implemented (#i113683#)"); @@ -94,7 +92,6 @@ namespace DOM Reference< XNode > SAL_CALL CEntitiesMap::removeNamedItemNS( OUString const& /*namespaceURI*/, OUString const& /*localName*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::removeNamedItemNS: not implemented (#i113683#)"); @@ -106,7 +103,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CEntitiesMap::setNamedItem(Reference< XNode > const& /*arg*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::setNamedItem: not implemented (#i113683#)"); @@ -118,7 +114,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CEntitiesMap::setNamedItemNS(Reference< XNode > const& /*arg*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::setNamedItemNS: not implemented (#i113683#)"); diff --git a/unoxml/source/dom/entitiesmap.hxx b/unoxml/source/dom/entitiesmap.hxx index b358ae6795a7..af3ad4218aee 100644 --- a/unoxml/source/dom/entitiesmap.hxx +++ b/unoxml/source/dom/entitiesmap.hxx @@ -42,53 +42,49 @@ namespace DOM /** The number of nodes in this map. */ - virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLength() override; /** Retrieves a node specified by local name */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - getNamedItem(const OUString& name) throw (css::uno::RuntimeException, std::exception) override; + getNamedItem(const OUString& name) override; /** Retrieves a node specified by local name and namespace URI. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItemNS( - OUString const& namespaceURI, OUString const& localName) - throw (css::uno::RuntimeException, std::exception) override; + OUString const& namespaceURI, OUString const& localName) override; /** Returns the indexth item in the map. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - item(sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override; + item(sal_Int32 index) override; /** Removes a node specified by name. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - removeNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) override; + removeNamedItem(OUString const& name) override; /** // Removes a node specified by local name and namespace URI. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeNamedItemNS( - OUString const& namespaceURI, OUString const& localName) - throw (css::uno::RuntimeException, std::exception) override; + OUString const& namespaceURI, OUString const& localName) override; /** // Adds a node using its nodeName attribute. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg) - throw (css::uno::RuntimeException, std::exception) override; + setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg) override; /** Adds a node using its namespaceURI and localName. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg) - throw (css::uno::RuntimeException, std::exception) override; + setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg) override; }; } diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx index 7ce7817319db..87d0f9c74efb 100644 --- a/unoxml/source/dom/entity.cxx +++ b/unoxml/source/dom/entity.cxx @@ -55,7 +55,7 @@ namespace DOM /** For unparsed entities, the name of the notation for the entity. */ - OUString SAL_CALL CEntity::getNotationName() throw (RuntimeException, std::exception) + OUString SAL_CALL CEntity::getNotationName() { OSL_ENSURE(false, "CEntity::getNotationName: not implemented (#i113683#)"); @@ -65,7 +65,7 @@ namespace DOM /** The public identifier associated with the entity, if specified. */ - OUString SAL_CALL CEntity::getPublicId() throw (RuntimeException, std::exception) + OUString SAL_CALL CEntity::getPublicId() { ::osl::MutexGuard const g(m_rMutex); @@ -80,7 +80,7 @@ namespace DOM /** The system identifier associated with the entity, if specified. */ - OUString SAL_CALL CEntity::getSystemId() throw (RuntimeException, std::exception) + OUString SAL_CALL CEntity::getSystemId() { ::osl::MutexGuard const g(m_rMutex); @@ -91,7 +91,7 @@ namespace DOM } return aID; } - OUString SAL_CALL CEntity::getNodeName()throw (RuntimeException, std::exception) + OUString SAL_CALL CEntity::getNodeName() { ::osl::MutexGuard const g(m_rMutex); @@ -103,7 +103,7 @@ namespace DOM } return aName; } - OUString SAL_CALL CEntity::getNodeValue() throw (RuntimeException, std::exception) + OUString SAL_CALL CEntity::getNodeValue() { return OUString(); } diff --git a/unoxml/source/dom/entity.hxx b/unoxml/source/dom/entity.hxx index 3bcc94408f87..51c10ce00005 100644 --- a/unoxml/source/dom/entity.hxx +++ b/unoxml/source/dom/entity.hxx @@ -54,139 +54,114 @@ namespace DOM /** For unparsed entities, the name of the notation for the entity. */ - virtual OUString SAL_CALL getNotationName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNotationName() override; /** The public identifier associated with the entity, if specified. */ - virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPublicId() override; /** The system identifier associated with the entity, if specified. */ - virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSystemId() override; // ---- resolve uno inheritance problems... // overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; + virtual OUString SAL_CALL getNodeValue() override; // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CNode::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CNode::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CNode::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CNode::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CNode::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CNode::getLastChild(); } - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLocalName() override { return CNode::getLocalName(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CNode::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CNode::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CNode::getNodeType(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CNode::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CNode::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CNode::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CNode::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CNode::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CNode::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CNode::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CNode::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CNode::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return CNode::setNodeValue(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/entityreference.cxx b/unoxml/source/dom/entityreference.cxx index 6d62e69d576c..f4955aeba88b 100644 --- a/unoxml/source/dom/entityreference.cxx +++ b/unoxml/source/dom/entityreference.cxx @@ -49,7 +49,7 @@ namespace DOM } } - OUString SAL_CALL CEntityReference::getNodeName()throw (RuntimeException, std::exception) + OUString SAL_CALL CEntityReference::getNodeName() { ::osl::MutexGuard const g(m_rMutex); @@ -62,7 +62,7 @@ namespace DOM return aName; } - OUString SAL_CALL CEntityReference::getNodeValue() throw (RuntimeException, std::exception) + OUString SAL_CALL CEntityReference::getNodeValue() { return OUString(); } diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx index 1ce5c3648559..711818d7e948 100644 --- a/unoxml/source/dom/entityreference.hxx +++ b/unoxml/source/dom/entityreference.hxx @@ -49,125 +49,100 @@ namespace DOM // ---- resolve uno inheritance problems... // overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; + virtual OUString SAL_CALL getNodeValue() override; // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CNode::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CNode::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CNode::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CNode::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CNode::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CNode::getLastChild(); } - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLocalName() override { return CNode::getLocalName(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CNode::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CNode::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CNode::getNodeType(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CNode::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CNode::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CNode::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CNode::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CNode::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CNode::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CNode::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CNode::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CNode::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return CNode::setNodeValue(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 3617d1f45d5d..2d191b5cd997 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -285,7 +285,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CNode::appendChild( Reference< XNode > const& xNewChild) - throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -387,7 +386,6 @@ namespace DOM constructor for nodes. */ Reference< XNode > SAL_CALL CNode::cloneNode(sal_Bool bDeep) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -406,7 +404,6 @@ namespace DOM or null otherwise. */ Reference< XNamedNodeMap > SAL_CALL CNode::getAttributes() - throw (RuntimeException, std::exception) { // return empty reference; only element node may override this impl return Reference< XNamedNodeMap>(); @@ -416,7 +413,6 @@ namespace DOM A NodeList that contains all children of this node. */ Reference< XNodeList > SAL_CALL CNode::getChildNodes() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -431,7 +427,6 @@ namespace DOM The first child of this node. */ Reference< XNode > SAL_CALL CNode::getFirstChild() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -447,7 +442,6 @@ namespace DOM The last child of this node. */ Reference< XNode > SAL_CALL CNode::getLastChild() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -463,7 +457,6 @@ namespace DOM Returns the local part of the qualified name of this node. */ OUString SAL_CALL CNode::getLocalName() - throw (RuntimeException, std::exception) { // see CElement/CAttr return OUString(); @@ -474,7 +467,6 @@ namespace DOM The namespace URI of this node, or null if it is unspecified. */ OUString SAL_CALL CNode::getNamespaceURI() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -493,7 +485,6 @@ namespace DOM The node immediately following this node. */ Reference< XNode > SAL_CALL CNode::getNextSibling() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -509,7 +500,6 @@ namespace DOM The name of this node, depending on its type; see the table above. */ OUString SAL_CALL CNode::getNodeName() - throw (RuntimeException, std::exception) { /* Interface nodeName nodeValue attributes @@ -537,7 +527,6 @@ namespace DOM A code representing the type of the underlying object, as defined above. */ NodeType SAL_CALL CNode::getNodeType() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -548,7 +537,6 @@ namespace DOM The value of this node, depending on its type; see the table above. */ OUString SAL_CALL CNode::getNodeValue() - throw (RuntimeException, std::exception) { OUString aValue; return aValue; @@ -558,7 +546,6 @@ namespace DOM The Document object associated with this node. */ Reference< XDocument > SAL_CALL CNode::getOwnerDocument() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -573,7 +560,6 @@ namespace DOM The parent of this node. */ Reference< XNode > SAL_CALL CNode::getParentNode() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -589,7 +575,6 @@ namespace DOM The namespace prefix of this node, or null if it is unspecified. */ OUString SAL_CALL CNode::getPrefix() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -610,7 +595,6 @@ namespace DOM The node immediately preceding this node. */ Reference< XNode > SAL_CALL CNode::getPreviousSibling() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -626,7 +610,6 @@ namespace DOM Returns whether this node (if it is an element) has any attributes. */ sal_Bool SAL_CALL CNode::hasAttributes() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -637,7 +620,6 @@ namespace DOM Returns whether this node has any children. */ sal_Bool SAL_CALL CNode::hasChildNodes() - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -649,7 +631,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CNode::insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException, std::exception) { if (!newChild.is() || !refChild.is()) { throw RuntimeException(); } @@ -728,7 +709,6 @@ namespace DOM that feature is supported by this node. */ sal_Bool SAL_CALL CNode::isSupported(const OUString& /*feature*/, const OUString& /*ver*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNode::isSupported: not implemented (#i113683#)"); return false; @@ -742,7 +722,6 @@ namespace DOM Text nodes nor empty Text nodes. */ void SAL_CALL CNode::normalize() - throw (RuntimeException, std::exception) { //XXX combine adjacent text nodes and remove empty ones OSL_ENSURE(false, "CNode::normalize: not implemented (#i113683#)"); @@ -754,7 +733,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CNode::removeChild(const Reference< XNode >& xOldChild) - throw (RuntimeException, DOMException, std::exception) { if (!xOldChild.is()) { throw RuntimeException(); @@ -830,7 +808,6 @@ namespace DOM Reference< XNode > SAL_CALL CNode::replaceChild( Reference< XNode > const& xNewChild, Reference< XNode > const& xOldChild) - throw (RuntimeException, DOMException, std::exception) { if (!xOldChild.is() || !xNewChild.is()) { throw RuntimeException(); @@ -948,7 +925,6 @@ namespace DOM The value of this node, depending on its type; see the table above. */ void SAL_CALL CNode::setNodeValue(const OUString& /*nodeValue*/) - throw (RuntimeException, DOMException, std::exception) { // use specific node implementation // if we end up down here, something went wrong @@ -961,7 +937,6 @@ namespace DOM The namespace prefix of this node, or null if it is unspecified. */ void SAL_CALL CNode::setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -987,7 +962,6 @@ namespace DOM void SAL_CALL CNode::addEventListener(const OUString& eventType, const Reference< css::xml::dom::events::XEventListener >& listener, sal_Bool useCapture) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -999,7 +973,6 @@ namespace DOM void SAL_CALL CNode::removeEventListener(const OUString& eventType, const Reference< css::xml::dom::events::XEventListener >& listener, sal_Bool useCapture) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -1009,7 +982,6 @@ namespace DOM } sal_Bool SAL_CALL CNode::dispatchEvent(const Reference< XEvent >& evt) - throw(RuntimeException, EventException, std::exception) { CDocument * pDocument; events::CEventDispatcher * pDispatcher; @@ -1028,7 +1000,6 @@ namespace DOM ::sal_Int64 SAL_CALL CNode::getSomething(Sequence< ::sal_Int8 > const& rId) - throw (RuntimeException, std::exception) { if ((rId.getLength() == 16) && (0 == memcmp(theCNodeUnoTunnelId::get().getSeq().getConstArray(), diff --git a/unoxml/source/dom/notation.cxx b/unoxml/source/dom/notation.cxx index 2fa8e3f6f71b..f3a137b3c712 100644 --- a/unoxml/source/dom/notation.cxx +++ b/unoxml/source/dom/notation.cxx @@ -35,7 +35,7 @@ namespace DOM { } - OUString SAL_CALL CNotation::getPublicId() throw (RuntimeException, std::exception) + OUString SAL_CALL CNotation::getPublicId() { OSL_ENSURE(false, "CNotation::getPublicId: not implemented (#i113683#)"); @@ -45,7 +45,7 @@ namespace DOM /** The system identifier of this notation. */ - OUString SAL_CALL CNotation::getSystemId() throw (RuntimeException, std::exception) + OUString SAL_CALL CNotation::getSystemId() { OSL_ENSURE(false, "CNotation::getSystemId: not implemented (#i113683#)"); @@ -53,7 +53,7 @@ namespace DOM } - OUString SAL_CALL CNotation::getNodeName()throw (RuntimeException, std::exception) + OUString SAL_CALL CNotation::getNodeName() { ::osl::MutexGuard const g(m_rMutex); @@ -66,7 +66,7 @@ namespace DOM return aName; } - OUString SAL_CALL CNotation::getNodeValue() throw (RuntimeException, std::exception) + OUString SAL_CALL CNotation::getNodeValue() { return OUString(); } diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx index 434b1b8d486c..099905acf3ac 100644 --- a/unoxml/source/dom/notation.hxx +++ b/unoxml/source/dom/notation.hxx @@ -45,134 +45,109 @@ namespace DOM /** The public identifier of this notation. */ - virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPublicId() override; /** The system identifier of this notation. */ - virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSystemId() override; // ---- resolve uno inheritance problems... // overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; + virtual OUString SAL_CALL getNodeValue() override; // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CNode::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CNode::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CNode::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CNode::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CNode::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CNode::getLastChild(); } - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLocalName() override { return CNode::getLocalName(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CNode::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CNode::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CNode::getNodeType(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CNode::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CNode::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CNode::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CNode::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CNode::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CNode::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CNode::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CNode::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CNode::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return CNode::setNodeValue(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/notationsmap.cxx b/unoxml/source/dom/notationsmap.cxx index d2fc182cab8a..30bb0e456d25 100644 --- a/unoxml/source/dom/notationsmap.cxx +++ b/unoxml/source/dom/notationsmap.cxx @@ -35,7 +35,7 @@ namespace DOM /** The number of nodes in this map. */ - sal_Int32 SAL_CALL CNotationsMap::getLength() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CNotationsMap::getLength() { OSL_ENSURE(false, "CNotationsMap::getLength: not implemented (#i113683#)"); @@ -47,7 +47,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CNotationsMap::getNamedItem(OUString const& /*name*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::getNamedItem: not implemented (#i113683#)"); @@ -60,7 +59,6 @@ namespace DOM Reference< XNode > SAL_CALL CNotationsMap::getNamedItemNS( OUString const& /*namespaceURI*/, OUString const& /*localName*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::getNamedItemNS: not implemented (#i113683#)"); @@ -71,7 +69,7 @@ namespace DOM Returns the indexth item in the map. */ Reference< XNode > SAL_CALL - CNotationsMap::item(sal_Int32 /*index*/) throw (RuntimeException, std::exception) + CNotationsMap::item(sal_Int32 /*index*/) { OSL_ENSURE(false, "CNotationsMap::item: not implemented (#i113683#)"); return Reference< XNode >(); @@ -82,7 +80,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CNotationsMap::removeNamedItem(OUString const& /*name*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::removeNamedItem: not implemented (#i113683#)"); @@ -95,7 +92,6 @@ namespace DOM Reference< XNode > SAL_CALL CNotationsMap::removeNamedItemNS( OUString const& /*namespaceURI*/, OUString const& /*localName*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::removeNamedItemNS: not implemented (#i113683#)"); @@ -107,7 +103,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CNotationsMap::setNamedItem(Reference< XNode > const& /*arg*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::setNamedItem: not implemented (#i113683#)"); @@ -119,7 +114,6 @@ namespace DOM */ Reference< XNode > SAL_CALL CNotationsMap::setNamedItemNS(Reference< XNode > const& /*arg*/) - throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::setNamedItemNS: not implemented (#i113683#)"); diff --git a/unoxml/source/dom/notationsmap.hxx b/unoxml/source/dom/notationsmap.hxx index a68452e44fd8..daabc9f7f70e 100644 --- a/unoxml/source/dom/notationsmap.hxx +++ b/unoxml/source/dom/notationsmap.hxx @@ -42,53 +42,49 @@ namespace DOM /** The number of nodes in this map. */ - virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLength() override; /** Retrieves a node specified by local name */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - getNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) override; + getNamedItem(OUString const& name) override; /** Retrieves a node specified by local name and namespace URI. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItemNS( - OUString const& namespaceURI, OUString const& localName) - throw (css::uno::RuntimeException, std::exception) override; + OUString const& namespaceURI, OUString const& localName) override; /** Returns the indexth item in the map. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - item(sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override; + item(sal_Int32 index) override; /** Removes a node specified by name. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - removeNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) override; + removeNamedItem(OUString const& name) override; /** // Removes a node specified by local name and namespace URI. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeNamedItemNS( - OUString const& namespaceURI, OUString const& localName) - throw (css::uno::RuntimeException, std::exception) override; + OUString const& namespaceURI, OUString const& localName) override; /** // Adds a node using its nodeName attribute. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg) - throw (css::uno::RuntimeException, std::exception) override; + setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg) override; /** Adds a node using its namespaceURI and localName. */ virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg) - throw (css::uno::RuntimeException, std::exception) override; + setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg) override; }; } diff --git a/unoxml/source/dom/processinginstruction.cxx b/unoxml/source/dom/processinginstruction.cxx index 1cda0809808f..70f492ae4e4d 100644 --- a/unoxml/source/dom/processinginstruction.cxx +++ b/unoxml/source/dom/processinginstruction.cxx @@ -50,7 +50,7 @@ namespace DOM The content of this processing instruction. */ OUString SAL_CALL - CProcessingInstruction::getData() throw (RuntimeException, std::exception) + CProcessingInstruction::getData() { ::osl::MutexGuard const g(m_rMutex); @@ -71,7 +71,7 @@ namespace DOM The target of this processing instruction. */ OUString SAL_CALL - CProcessingInstruction::getTarget() throw (RuntimeException, std::exception) + CProcessingInstruction::getTarget() { ::osl::MutexGuard const g(m_rMutex); @@ -92,7 +92,6 @@ namespace DOM The content of this processing instruction. */ void SAL_CALL CProcessingInstruction::setData(OUString const& rData) - throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -109,7 +108,7 @@ namespace DOM } OUString SAL_CALL - CProcessingInstruction::getNodeName() throw (RuntimeException, std::exception) + CProcessingInstruction::getNodeName() { ::osl::MutexGuard const g(m_rMutex); @@ -124,14 +123,12 @@ namespace DOM } OUString SAL_CALL CProcessingInstruction::getNodeValue() - throw (RuntimeException, std::exception) { return getData(); } void SAL_CALL CProcessingInstruction::setNodeValue(OUString const& rNodeValue) - throw (RuntimeException, DOMException, std::exception) { return setData(rNodeValue); } diff --git a/unoxml/source/dom/processinginstruction.hxx b/unoxml/source/dom/processinginstruction.hxx index 212bbfd7ae11..0920edec47ba 100644 --- a/unoxml/source/dom/processinginstruction.hxx +++ b/unoxml/source/dom/processinginstruction.hxx @@ -51,137 +51,112 @@ namespace DOM /** The content of this processing instruction. */ - virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getData() override; /** The target of this processing instruction. */ - virtual OUString SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTarget() override; /** The content of this processing instruction. */ - virtual void SAL_CALL setData(const OUString& data) throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual void SAL_CALL setData(const OUString& data) override; // ---- resolve uno inheritance problems... // overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeValue() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNodeValue(OUString const& rNodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; + virtual OUString SAL_CALL getNodeValue() override; + virtual void SAL_CALL setNodeValue(OUString const& rNodeValue) override; // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CNode::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CNode::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CNode::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CNode::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CNode::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CNode::getLastChild(); } - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLocalName() override { return CNode::getLocalName(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CNode::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CNode::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CNode::getNodeType(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CNode::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CNode::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CNode::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CNode::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CNode::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CNode::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CNode::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CNode::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CNode::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CNode::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx index 786f3700b9f0..4bbd27176046 100644 --- a/unoxml/source/dom/saxbuilder.cxx +++ b/unoxml/source/dom/saxbuilder.cxx @@ -64,25 +64,21 @@ namespace DOM } Sequence< OUString > SAL_CALL CSAXDocumentBuilder::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return CSAXDocumentBuilder::_getSupportedServiceNames(); } OUString SAL_CALL CSAXDocumentBuilder::getImplementationName() - throw (RuntimeException, std::exception) { return CSAXDocumentBuilder::_getImplementationName(); } sal_Bool SAL_CALL CSAXDocumentBuilder::supportsService(const OUString& aServiceName) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, aServiceName); } SAXDocumentBuilderState SAL_CALL CSAXDocumentBuilder::getState() - throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -90,7 +86,6 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::reset() - throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -102,7 +97,6 @@ namespace DOM } Reference< XDocument > SAL_CALL CSAXDocumentBuilder::getDocument() - throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -113,7 +107,6 @@ namespace DOM } Reference< XDocumentFragment > SAL_CALL CSAXDocumentBuilder::getDocumentFragment() - throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -123,7 +116,6 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::startDocumentFragment(const Reference< XDocument >& ownerDoc) - throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -140,7 +132,6 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::endDocumentFragment() - throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -157,7 +148,7 @@ namespace DOM // document handler - void SAL_CALL CSAXDocumentBuilder::startDocument() throw (RuntimeException, SAXException, std::exception) + void SAL_CALL CSAXDocumentBuilder::startDocument() { ::osl::MutexGuard g(m_Mutex); @@ -173,7 +164,7 @@ namespace DOM m_aState = SAXDocumentBuilderState_BUILDING_DOCUMENT; } - void SAL_CALL CSAXDocumentBuilder::endDocument() throw (RuntimeException, SAXException, std::exception) + void SAL_CALL CSAXDocumentBuilder::endDocument() { ::osl::MutexGuard g(m_Mutex); @@ -189,7 +180,6 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::startElement(const OUString& aName, const Reference< XAttributeList>& attribs) - throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -290,7 +280,6 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::endElement(const OUString& aName) - throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -319,7 +308,6 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::characters(const OUString& aChars) - throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -333,7 +321,6 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::ignorableWhitespace(const OUString& ) - throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -344,7 +331,6 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::processingInstruction(const OUString& aTarget, const OUString& aData) - throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -359,7 +345,6 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::setDocumentLocator(const Reference< XLocator >& aLocator) - throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx index ad3e7ce4dca6..0caf53ea4faf 100644 --- a/unoxml/source/dom/saxbuilder.hxx +++ b/unoxml/source/dom/saxbuilder.hxx @@ -77,47 +77,30 @@ namespace DOM explicit CSAXDocumentBuilder(const css::uno::Reference< css::lang::XMultiServiceFactory >& mgr); // 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; // XDocumentHandler - virtual void SAL_CALL startDocument() - throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; - virtual void SAL_CALL endDocument() - throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; + virtual void SAL_CALL startDocument() override; + virtual void SAL_CALL endDocument() override; virtual void SAL_CALL startElement( const OUString& aName, - const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) - throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; - virtual void SAL_CALL endElement( const OUString& aName ) - throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; - virtual void SAL_CALL characters( const OUString& aChars ) - throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override; + virtual void SAL_CALL endElement( const OUString& aName ) override; + virtual void SAL_CALL characters( const OUString& aChars ) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override; virtual void SAL_CALL processingInstruction( const OUString& aTarget, - const OUString& aData ) - throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; - virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; + const OUString& aData ) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override; // XSAXDocumentBuilder - virtual css::xml::dom::SAXDocumentBuilderState SAL_CALL getState() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reset() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getDocument() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::XDocumentFragment > SAL_CALL getDocumentFragment() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startDocumentFragment(const css::uno::Reference< css::xml::dom::XDocument >& ownerDoc) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocumentFragment() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::xml::dom::SAXDocumentBuilderState SAL_CALL getState() override; + virtual void SAL_CALL reset() override; + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getDocument() override; + virtual css::uno::Reference< css::xml::dom::XDocumentFragment > SAL_CALL getDocumentFragment() override; + virtual void SAL_CALL startDocumentFragment(const css::uno::Reference< css::xml::dom::XDocument >& ownerDoc) override; + virtual void SAL_CALL endDocumentFragment() override; }; diff --git a/unoxml/source/dom/text.cxx b/unoxml/source/dom/text.cxx index cb0d5aaf6e20..030c16db238b 100644 --- a/unoxml/source/dom/text.cxx +++ b/unoxml/source/dom/text.cxx @@ -58,13 +58,12 @@ namespace DOM } } - OUString SAL_CALL CText::getNodeName() throw (RuntimeException, std::exception) + OUString SAL_CALL CText::getNodeName() { return OUString("#text"); } Reference< XText > SAL_CALL CText::splitText(sal_Int32 /*offset*/) - throw (RuntimeException, std::exception) { OSL_FAIL("CText::splitText: not implemented (#i113683#)"); return Reference< XText >(this); diff --git a/unoxml/source/dom/text.hxx b/unoxml/source/dom/text.hxx index 884f7d6d4eaa..8ef372981e32 100644 --- a/unoxml/source/dom/text.hxx +++ b/unoxml/source/dom/text.hxx @@ -56,175 +56,144 @@ namespace DOM // Breaks this node into two nodes at the specified offset, keeping // both in the tree as siblings. - virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL splitText(sal_Int32 offset) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL splitText(sal_Int32 offset) override; // --- delegations for XCharacterData - virtual void SAL_CALL appendData(const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL appendData(const OUString& arg) override { CCharacterData::appendData(arg); } - virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) override { CCharacterData::deleteData(offset, count); } - virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getData() override { return CCharacterData::getData(); } - virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getLength() override { return CCharacterData::getLength(); } - virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) override { CCharacterData::insertData(offset, arg); } - virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) override { CCharacterData::replaceData(offset, count, arg); } - virtual void SAL_CALL setData(const OUString& data) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setData(const OUString& data) override { CCharacterData::setData(data); } - virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) override { return CCharacterData::subStringData(offset, count); } // --- overrides for XNode base - virtual OUString SAL_CALL getNodeName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeName() override; // --- resolve uno inheritance problems... // --- delegation for XNode base. - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override { return CCharacterData::appendChild(newChild); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override { return CCharacterData::cloneNode(deep); } - virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override { return CCharacterData::getAttributes(); } - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override { return CCharacterData::getChildNodes(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override { return CCharacterData::getFirstChild(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override { return CCharacterData::getLastChild(); } - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLocalName() override { return CCharacterData::getLocalName(); } - virtual OUString SAL_CALL getNamespaceURI() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNamespaceURI() override { return CCharacterData::getNamespaceURI(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override { return CCharacterData::getNextSibling(); } - virtual css::xml::dom::NodeType SAL_CALL getNodeType() - throw (css::uno::RuntimeException, std::exception) override + virtual css::xml::dom::NodeType SAL_CALL getNodeType() override { return CCharacterData::getNodeType(); } - virtual OUString SAL_CALL getNodeValue() throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getNodeValue() override { return CCharacterData::getNodeValue(); } - virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override { return CCharacterData::getOwnerDocument(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override { return CCharacterData::getParentNode(); } - virtual OUString SAL_CALL getPrefix() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPrefix() override { return CCharacterData::getPrefix(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override { return CCharacterData::getPreviousSibling(); } - virtual sal_Bool SAL_CALL hasAttributes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAttributes() override { return CCharacterData::hasAttributes(); } - virtual sal_Bool SAL_CALL hasChildNodes() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return CCharacterData::hasChildNodes(); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override { return CCharacterData::insertBefore(newChild, refChild); } - virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override { return CCharacterData::isSupported(feature, ver); } - virtual void SAL_CALL normalize() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL normalize() override { CCharacterData::normalize(); } - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CCharacterData::removeChild(oldChild); } virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild( - const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override { return CCharacterData::replaceChild(newChild, oldChild); } - virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override { return CCharacterData::setNodeValue(nodeValue); } - virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override + virtual void SAL_CALL setPrefix(const OUString& prefix) override { return CCharacterData::setPrefix(prefix); } diff --git a/unoxml/source/events/event.cxx b/unoxml/source/events/event.cxx index 39b2f850679b..ade1e56285db 100644 --- a/unoxml/source/events/event.cxx +++ b/unoxml/source/events/event.cxx @@ -37,64 +37,64 @@ namespace DOM { namespace events { } - OUString SAL_CALL CEvent::getType() throw (RuntimeException, std::exception) + OUString SAL_CALL CEvent::getType() { ::osl::MutexGuard const g(m_Mutex); return m_eventType; } Reference< XEventTarget > SAL_CALL - CEvent::getTarget() throw (RuntimeException, std::exception) + CEvent::getTarget() { ::osl::MutexGuard const g(m_Mutex); return m_target; } Reference< XEventTarget > SAL_CALL - CEvent::getCurrentTarget() throw (RuntimeException, std::exception) + CEvent::getCurrentTarget() { ::osl::MutexGuard const g(m_Mutex); return m_currentTarget; } - PhaseType SAL_CALL CEvent::getEventPhase() throw (RuntimeException, std::exception) + PhaseType SAL_CALL CEvent::getEventPhase() { ::osl::MutexGuard const g(m_Mutex); return m_phase; } - sal_Bool SAL_CALL CEvent::getBubbles() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CEvent::getBubbles() { ::osl::MutexGuard const g(m_Mutex); return m_bubbles; } - sal_Bool SAL_CALL CEvent::getCancelable() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CEvent::getCancelable() { ::osl::MutexGuard const g(m_Mutex); return m_cancelable; } css::util::Time SAL_CALL - CEvent::getTimeStamp() throw (RuntimeException, std::exception) + CEvent::getTimeStamp() { ::osl::MutexGuard const g(m_Mutex); return m_time; } - void SAL_CALL CEvent::stopPropagation() throw (RuntimeException, std::exception) + void SAL_CALL CEvent::stopPropagation() { ::osl::MutexGuard const g(m_Mutex); if (m_cancelable) { m_canceled = true; } } - void SAL_CALL CEvent::preventDefault() throw (RuntimeException, std::exception) + void SAL_CALL CEvent::preventDefault() { } void SAL_CALL CEvent::initEvent(OUString const& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (RuntimeException, std::exception) + sal_Bool cancelableArg) { ::osl::MutexGuard const g(m_Mutex); diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx index e829ae496cfd..ed07d59f2639 100644 --- a/unoxml/source/events/event.hxx +++ b/unoxml/source/events/event.hxx @@ -53,19 +53,19 @@ public: explicit CEvent(); virtual ~CEvent() override; - virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override; - virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getType() override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override; + virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override; + virtual sal_Bool SAL_CALL getBubbles() override; + virtual sal_Bool SAL_CALL getCancelable() override; + virtual css::util::Time SAL_CALL getTimeStamp() override; + virtual void SAL_CALL stopPropagation() override; + virtual void SAL_CALL preventDefault() override; virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (css::uno::RuntimeException, std::exception) override; + sal_Bool cancelableArg) override; }; }} #endif diff --git a/unoxml/source/events/mouseevent.cxx b/unoxml/source/events/mouseevent.cxx index b710d799e1b0..7b0c71cd17c4 100644 --- a/unoxml/source/events/mouseevent.cxx +++ b/unoxml/source/events/mouseevent.cxx @@ -39,52 +39,52 @@ namespace DOM { namespace events { } - sal_Int32 SAL_CALL CMouseEvent::getScreenX() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CMouseEvent::getScreenX() { ::osl::MutexGuard const g(m_Mutex); return m_screenX; } - sal_Int32 SAL_CALL CMouseEvent::getScreenY() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CMouseEvent::getScreenY() { ::osl::MutexGuard const g(m_Mutex); return m_screenY; } - sal_Int32 SAL_CALL CMouseEvent::getClientX() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CMouseEvent::getClientX() { ::osl::MutexGuard const g(m_Mutex); return m_clientX; } - sal_Int32 SAL_CALL CMouseEvent::getClientY() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CMouseEvent::getClientY() { ::osl::MutexGuard const g(m_Mutex); return m_clientY; } - sal_Bool SAL_CALL CMouseEvent::getCtrlKey() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CMouseEvent::getCtrlKey() { ::osl::MutexGuard const g(m_Mutex); return m_ctrlKey; } - sal_Bool SAL_CALL CMouseEvent::getShiftKey() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CMouseEvent::getShiftKey() { ::osl::MutexGuard const g(m_Mutex); return m_shiftKey; } - sal_Bool SAL_CALL CMouseEvent::getAltKey() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CMouseEvent::getAltKey() { ::osl::MutexGuard const g(m_Mutex); return m_altKey; } - sal_Bool SAL_CALL CMouseEvent::getMetaKey() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CMouseEvent::getMetaKey() { ::osl::MutexGuard const g(m_Mutex); return m_metaKey; } - sal_Int16 SAL_CALL CMouseEvent::getButton() throw (RuntimeException, std::exception) + sal_Int16 SAL_CALL CMouseEvent::getButton() { ::osl::MutexGuard const g(m_Mutex); return m_button; } - Reference< XEventTarget > SAL_CALL CMouseEvent::getRelatedTarget() throw(RuntimeException, std::exception) + Reference< XEventTarget > SAL_CALL CMouseEvent::getRelatedTarget() { ::osl::MutexGuard const g(m_Mutex); return m_relatedTarget; @@ -106,7 +106,6 @@ namespace DOM { namespace events sal_Bool metaKeyArg, sal_Int16 buttonArg, const Reference< XEventTarget >& /*relatedTargetArg*/) - throw(RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -123,12 +122,12 @@ namespace DOM { namespace events } // delegate to CUIEvent, since we are inheriting from CUIEvent and XUIEvent - Reference< XAbstractView > SAL_CALL CMouseEvent::getView() throw(RuntimeException, std::exception) + Reference< XAbstractView > SAL_CALL CMouseEvent::getView() { return CUIEvent::getView(); } - sal_Int32 SAL_CALL CMouseEvent::getDetail() throw(RuntimeException, std::exception) + sal_Int32 SAL_CALL CMouseEvent::getDetail() { return CUIEvent::getDetail(); } @@ -137,58 +136,58 @@ namespace DOM { namespace events sal_Bool canBubbleArg, sal_Bool cancelableArg, const Reference< XAbstractView >& viewArg, - sal_Int32 detailArg) throw(RuntimeException, std::exception) + sal_Int32 detailArg) { CUIEvent::initUIEvent(typeArg, canBubbleArg, cancelableArg, viewArg, detailArg); } - OUString SAL_CALL CMouseEvent::getType() throw (RuntimeException, std::exception) + OUString SAL_CALL CMouseEvent::getType() { return CUIEvent::getType(); } - Reference< XEventTarget > SAL_CALL CMouseEvent::getTarget() throw (RuntimeException, std::exception) + Reference< XEventTarget > SAL_CALL CMouseEvent::getTarget() { return CUIEvent::getTarget(); } - Reference< XEventTarget > SAL_CALL CMouseEvent::getCurrentTarget() throw (RuntimeException, std::exception) + Reference< XEventTarget > SAL_CALL CMouseEvent::getCurrentTarget() { return CUIEvent::getCurrentTarget(); } - PhaseType SAL_CALL CMouseEvent::getEventPhase() throw (RuntimeException, std::exception) + PhaseType SAL_CALL CMouseEvent::getEventPhase() { return CUIEvent::getEventPhase(); } - sal_Bool SAL_CALL CMouseEvent::getBubbles() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CMouseEvent::getBubbles() { return CEvent::getBubbles(); } - sal_Bool SAL_CALL CMouseEvent::getCancelable() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CMouseEvent::getCancelable() { return CUIEvent::getCancelable(); } - css::util::Time SAL_CALL CMouseEvent::getTimeStamp() throw (RuntimeException, std::exception) + css::util::Time SAL_CALL CMouseEvent::getTimeStamp() { return CUIEvent::getTimeStamp(); } - void SAL_CALL CMouseEvent::stopPropagation() throw (RuntimeException, std::exception) + void SAL_CALL CMouseEvent::stopPropagation() { CUIEvent::stopPropagation(); } - void SAL_CALL CMouseEvent::preventDefault() throw (RuntimeException, std::exception) + void SAL_CALL CMouseEvent::preventDefault() { CUIEvent::preventDefault(); } void SAL_CALL CMouseEvent::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (RuntimeException, std::exception) + sal_Bool cancelableArg) { // base initializer CUIEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx index 4c1964a71c1e..4fa5f28b75aa 100644 --- a/unoxml/source/events/mouseevent.hxx +++ b/unoxml/source/events/mouseevent.hxx @@ -50,16 +50,16 @@ protected: public: explicit CMouseEvent(); - virtual sal_Int32 SAL_CALL getScreenX() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScreenY() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getClientX() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getClientY() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCtrlKey() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getShiftKey() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAltKey() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMetaKey() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getButton() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getRelatedTarget() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getScreenX() override; + virtual sal_Int32 SAL_CALL getScreenY() override; + virtual sal_Int32 SAL_CALL getClientX() override; + virtual sal_Int32 SAL_CALL getClientY() override; + virtual sal_Bool SAL_CALL getCtrlKey() override; + virtual sal_Bool SAL_CALL getShiftKey() override; + virtual sal_Bool SAL_CALL getAltKey() override; + virtual sal_Bool SAL_CALL getMetaKey() override; + virtual sal_Int16 SAL_CALL getButton() override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getRelatedTarget() override; virtual void SAL_CALL initMouseEvent( const OUString& typeArg, @@ -76,31 +76,29 @@ public: sal_Bool shiftKeyArg, sal_Bool metaKeyArg, sal_Int16 buttonArg, - const css::uno::Reference< css::xml::dom::events::XEventTarget >& relatedTargetArg) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::dom::events::XEventTarget >& relatedTargetArg) override; // delegate to CUIevent - virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDetail() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() override; + virtual sal_Int32 SAL_CALL getDetail() override; virtual void SAL_CALL initUIEvent(const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg, const css::uno::Reference< css::xml::dom::views::XAbstractView >& viewArg, - sal_Int32 detailArg) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override; - virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 detailArg) override; + virtual OUString SAL_CALL getType() override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override; + virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override; + virtual sal_Bool SAL_CALL getBubbles() override; + virtual sal_Bool SAL_CALL getCancelable() override; + virtual css::util::Time SAL_CALL getTimeStamp() override; + virtual void SAL_CALL stopPropagation() override; + virtual void SAL_CALL preventDefault() override; virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool cancelableArg) override; }; }} #endif diff --git a/unoxml/source/events/mutationevent.cxx b/unoxml/source/events/mutationevent.cxx index 16ebd52a462d..b0648a6de5a9 100644 --- a/unoxml/source/events/mutationevent.cxx +++ b/unoxml/source/events/mutationevent.cxx @@ -35,31 +35,31 @@ namespace DOM { namespace events { } - Reference< XNode > SAL_CALL CMutationEvent::getRelatedNode() throw (RuntimeException, std::exception) + Reference< XNode > SAL_CALL CMutationEvent::getRelatedNode() { ::osl::MutexGuard const g(m_Mutex); return m_relatedNode; } - OUString SAL_CALL CMutationEvent::getPrevValue() throw (RuntimeException, std::exception) + OUString SAL_CALL CMutationEvent::getPrevValue() { ::osl::MutexGuard const g(m_Mutex); return m_prevValue; } - OUString SAL_CALL CMutationEvent::getNewValue() throw (RuntimeException, std::exception) + OUString SAL_CALL CMutationEvent::getNewValue() { ::osl::MutexGuard const g(m_Mutex); return m_newValue; } - OUString SAL_CALL CMutationEvent::getAttrName() throw (RuntimeException, std::exception) + OUString SAL_CALL CMutationEvent::getAttrName() { ::osl::MutexGuard const g(m_Mutex); return m_attrName; } - AttrChangeType SAL_CALL CMutationEvent::getAttrChange() throw (RuntimeException, std::exception) + AttrChangeType SAL_CALL CMutationEvent::getAttrChange() { ::osl::MutexGuard const g(m_Mutex); return m_attrChangeType; @@ -69,7 +69,7 @@ namespace DOM { namespace events sal_Bool canBubbleArg, sal_Bool cancelableArg, const Reference< XNode >& relatedNodeArg, const OUString& prevValueArg, const OUString& newValueArg, const OUString& attrNameArg, - AttrChangeType attrChangeArg) throw (RuntimeException, std::exception) + AttrChangeType attrChangeArg) { ::osl::MutexGuard const g(m_Mutex); @@ -82,52 +82,52 @@ namespace DOM { namespace events } // delegate to CEvent, since we are inheriting from CEvent and XEvent - OUString SAL_CALL CMutationEvent::getType() throw (RuntimeException, std::exception) + OUString SAL_CALL CMutationEvent::getType() { return CEvent::getType(); } - Reference< XEventTarget > SAL_CALL CMutationEvent::getTarget() throw (RuntimeException, std::exception) + Reference< XEventTarget > SAL_CALL CMutationEvent::getTarget() { return CEvent::getTarget(); } - Reference< XEventTarget > SAL_CALL CMutationEvent::getCurrentTarget() throw (RuntimeException, std::exception) + Reference< XEventTarget > SAL_CALL CMutationEvent::getCurrentTarget() { return CEvent::getCurrentTarget(); } - PhaseType SAL_CALL CMutationEvent::getEventPhase() throw (RuntimeException, std::exception) + PhaseType SAL_CALL CMutationEvent::getEventPhase() { return CEvent::getEventPhase(); } - sal_Bool SAL_CALL CMutationEvent::getBubbles() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CMutationEvent::getBubbles() { return CEvent::getBubbles(); } - sal_Bool SAL_CALL CMutationEvent::getCancelable() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CMutationEvent::getCancelable() { return CEvent::getCancelable(); } - css::util::Time SAL_CALL CMutationEvent::getTimeStamp() throw (RuntimeException, std::exception) + css::util::Time SAL_CALL CMutationEvent::getTimeStamp() { return CEvent::getTimeStamp(); } - void SAL_CALL CMutationEvent::stopPropagation() throw (RuntimeException, std::exception) + void SAL_CALL CMutationEvent::stopPropagation() { CEvent::stopPropagation(); } - void SAL_CALL CMutationEvent::preventDefault() throw (RuntimeException, std::exception) + void SAL_CALL CMutationEvent::preventDefault() { CEvent::preventDefault(); } void SAL_CALL CMutationEvent::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (RuntimeException, std::exception) + sal_Bool cancelableArg) { // base initializer CEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx index 224d8943adb7..413d062e6f9a 100644 --- a/unoxml/source/events/mutationevent.hxx +++ b/unoxml/source/events/mutationevent.hxx @@ -52,11 +52,11 @@ public: virtual ~CMutationEvent() override; - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getRelatedNode() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getPrevValue() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNewValue() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAttrName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::xml::dom::events::AttrChangeType SAL_CALL getAttrChange() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getRelatedNode() override; + virtual OUString SAL_CALL getPrevValue() override; + virtual OUString SAL_CALL getNewValue() override; + virtual OUString SAL_CALL getAttrName() override; + virtual css::xml::dom::events::AttrChangeType SAL_CALL getAttrChange() override; virtual void SAL_CALL initMutationEvent( const OUString& typeArg, sal_Bool canBubbleArg, @@ -65,23 +65,22 @@ public: const OUString& prevValueArg, const OUString& newValueArg, const OUString& attrNameArg, - css::xml::dom::events::AttrChangeType attrChangeArg) throw (css::uno::RuntimeException, std::exception) override; + css::xml::dom::events::AttrChangeType attrChangeArg) override; // delegate to CEvent, since we are inheriting from CEvent and XEvent - virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override; - virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getType() override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override; + virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override; + virtual sal_Bool SAL_CALL getBubbles() override; + virtual sal_Bool SAL_CALL getCancelable() override; + virtual css::util::Time SAL_CALL getTimeStamp() override; + virtual void SAL_CALL stopPropagation() override; + virtual void SAL_CALL preventDefault() override; virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool cancelableArg) override; }; }} #endif diff --git a/unoxml/source/events/uievent.cxx b/unoxml/source/events/uievent.cxx index 6d5177c2c948..48ad583c2d4c 100644 --- a/unoxml/source/events/uievent.cxx +++ b/unoxml/source/events/uievent.cxx @@ -32,13 +32,13 @@ namespace DOM { namespace events } Reference< XAbstractView > SAL_CALL - CUIEvent::getView() throw(RuntimeException, std::exception) + CUIEvent::getView() { ::osl::MutexGuard const g(m_Mutex); return m_view; } - sal_Int32 SAL_CALL CUIEvent::getDetail() throw(RuntimeException, std::exception) + sal_Int32 SAL_CALL CUIEvent::getDetail() { ::osl::MutexGuard const g(m_Mutex); return m_detail; @@ -48,7 +48,7 @@ namespace DOM { namespace events sal_Bool canBubbleArg, sal_Bool cancelableArg, const Reference< XAbstractView >& viewArg, - sal_Int32 detailArg) throw(RuntimeException, std::exception) + sal_Int32 detailArg) { ::osl::MutexGuard const g(m_Mutex); @@ -59,53 +59,53 @@ namespace DOM { namespace events // delegate to CEvent, since we are inheriting from CEvent and XEvent - OUString SAL_CALL CUIEvent::getType() throw (RuntimeException, std::exception) + OUString SAL_CALL CUIEvent::getType() { return CEvent::getType(); } - Reference< XEventTarget > SAL_CALL CUIEvent::getTarget() throw (RuntimeException, std::exception) + Reference< XEventTarget > SAL_CALL CUIEvent::getTarget() { return CEvent::getTarget(); } - Reference< XEventTarget > SAL_CALL CUIEvent::getCurrentTarget() throw (RuntimeException, std::exception) + Reference< XEventTarget > SAL_CALL CUIEvent::getCurrentTarget() { return CEvent::getCurrentTarget(); } - PhaseType SAL_CALL CUIEvent::getEventPhase() throw (RuntimeException, std::exception) + PhaseType SAL_CALL CUIEvent::getEventPhase() { return CEvent::getEventPhase(); } - sal_Bool SAL_CALL CUIEvent::getBubbles() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CUIEvent::getBubbles() { return CEvent::getBubbles(); } - sal_Bool SAL_CALL CUIEvent::getCancelable() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CUIEvent::getCancelable() { // mutation events cannot be canceled return false; } - css::util::Time SAL_CALL CUIEvent::getTimeStamp() throw (RuntimeException, std::exception) + css::util::Time SAL_CALL CUIEvent::getTimeStamp() { return CEvent::getTimeStamp(); } - void SAL_CALL CUIEvent::stopPropagation() throw (RuntimeException, std::exception) + void SAL_CALL CUIEvent::stopPropagation() { CEvent::stopPropagation(); } - void SAL_CALL CUIEvent::preventDefault() throw (RuntimeException, std::exception) + void SAL_CALL CUIEvent::preventDefault() { CEvent::preventDefault(); } void SAL_CALL CUIEvent::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (RuntimeException, std::exception) + sal_Bool cancelableArg) { // base initializer CEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); diff --git a/unoxml/source/events/uievent.hxx b/unoxml/source/events/uievent.hxx index 7a6b57030dfa..c82e600c24c6 100644 --- a/unoxml/source/events/uievent.hxx +++ b/unoxml/source/events/uievent.hxx @@ -44,29 +44,28 @@ protected: public: explicit CUIEvent(); - virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDetail() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() override; + virtual sal_Int32 SAL_CALL getDetail() override; virtual void SAL_CALL initUIEvent(const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg, const css::uno::Reference< css::xml::dom::views::XAbstractView >& viewArg, - sal_Int32 detailArg) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 detailArg) override; // delegate to CEvent, since we are inheriting from CEvent and XEvent - virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override; - virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getType() override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override; + virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override; + virtual sal_Bool SAL_CALL getBubbles() override; + virtual sal_Bool SAL_CALL getCancelable() override; + virtual css::util::Time SAL_CALL getTimeStamp() override; + virtual void SAL_CALL stopPropagation() override; + virtual void SAL_CALL preventDefault() override; virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool cancelableArg) override; }; }} #endif diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index 761082c27906..5d687876d223 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -41,15 +41,15 @@ public: CBlankNode(); // css::lang::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; // css::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override; // css::rdf::XNode: - virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getStringValue() override; private: CBlankNode(CBlankNode const&) = delete; @@ -63,23 +63,23 @@ CBlankNode::CBlankNode() : {} // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL CBlankNode::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL CBlankNode::getImplementationName() { return comp_CBlankNode::_getImplementationName(); } -sal_Bool SAL_CALL CBlankNode::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL CBlankNode::supportsService(OUString const & serviceName) { return cppu::supportsService(this, serviceName); } -css::uno::Sequence< OUString > SAL_CALL CBlankNode::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL CBlankNode::getSupportedServiceNames() { return comp_CBlankNode::_getSupportedServiceNames(); } // css::lang::XInitialization: -void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) +void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< css::uno::Any > & aArguments) { if (aArguments.getLength() != 1) { throw css::lang::IllegalArgumentException( @@ -105,7 +105,7 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< css::uno::Any > & } // css::rdf::XNode: -OUString SAL_CALL CBlankNode::getStringValue() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL CBlankNode::getStringValue() { return m_NodeID; } diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index bfcf0f150c98..6643df240acd 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -43,20 +43,20 @@ public: explicit CLiteral(); // css::lang::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; // css::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override; // css::rdf::XNode: - virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getStringValue() override; // css::rdf::XLiteral: - virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getValue() override; + virtual OUString SAL_CALL getLanguage() override; + virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() override; private: CLiteral(CLiteral const&) = delete; @@ -72,23 +72,23 @@ CLiteral::CLiteral() : {} // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL CLiteral::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL CLiteral::getImplementationName() { return comp_CLiteral::_getImplementationName(); } -sal_Bool SAL_CALL CLiteral::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL CLiteral::supportsService(OUString const & serviceName) { return cppu::supportsService(this, serviceName); } -css::uno::Sequence< OUString > SAL_CALL CLiteral::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL CLiteral::getSupportedServiceNames() { return comp_CLiteral::_getSupportedServiceNames(); } // css::lang::XInitialization: -void SAL_CALL CLiteral::initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) +void SAL_CALL CLiteral::initialize(const css::uno::Sequence< css::uno::Any > & aArguments) { const sal_Int32 len( aArguments.getLength() ); if (len < 1 || len > 2) { @@ -140,7 +140,7 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< css::uno::Any > & a } // css::rdf::XNode: -OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL CLiteral::getStringValue() { if (!m_Language.isEmpty()) { OUStringBuffer buf(m_Value); @@ -158,17 +158,17 @@ OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException, } // css::rdf::XLiteral: -OUString SAL_CALL CLiteral::getValue() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL CLiteral::getValue() { return m_Value; } -OUString SAL_CALL CLiteral::getLanguage() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL CLiteral::getLanguage() { return m_Language; } -css::uno::Reference< css::rdf::XURI > SAL_CALL CLiteral::getDatatype() throw (css::uno::RuntimeException, std::exception) +css::uno::Reference< css::rdf::XURI > SAL_CALL CLiteral::getDatatype() { return m_xDatatype; } diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index 6473ae3d78b7..0a6d903b1088 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -42,19 +42,19 @@ public: explicit CURI(); // css::lang::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; // css::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override; // css::rdf::XNode: - virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getStringValue() override; // css::rdf::XURI: - virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLocalName() override; + virtual OUString SAL_CALL getNamespace() override; private: CURI(CURI const&) = delete; @@ -72,17 +72,17 @@ CURI::CURI() : {} // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL CURI::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL CURI::getImplementationName() { return comp_CURI::_getImplementationName(); } -sal_Bool SAL_CALL CURI::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL CURI::supportsService(OUString const & serviceName) { return cppu::supportsService(this, serviceName); } -css::uno::Sequence< OUString > SAL_CALL CURI::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL CURI::getSupportedServiceNames() { return comp_CURI::_getSupportedServiceNames(); } @@ -709,7 +709,7 @@ void SAL_CALL CURI::initFromConstant(const sal_Int16 i_Constant) } // css::lang::XInitialization: -void SAL_CALL CURI::initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) +void SAL_CALL CURI::initialize(const css::uno::Sequence< css::uno::Any > & aArguments) { sal_Int32 len = aArguments.getLength(); if ((len < 1) || (len > 2)) { @@ -783,18 +783,18 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< css::uno::Any > & aArgu } // css::rdf::XNode: -OUString SAL_CALL CURI::getStringValue() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL CURI::getStringValue() { return m_Namespace + m_LocalName; } // css::rdf::XURI: -OUString SAL_CALL CURI::getNamespace() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL CURI::getNamespace() { return m_Namespace; } -OUString SAL_CALL CURI::getLocalName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL CURI::getLocalName() { return m_LocalName; } diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 82d0f9077f58..25ffe996041f 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -272,64 +272,40 @@ public: virtual ~librdf_Repository() override; // css::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString & ServiceName) throw (uno::RuntimeException, std::exception) override; + const OUString & ServiceName) override; virtual uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // css::rdf::XRepository: - virtual uno::Reference< rdf::XBlankNode > SAL_CALL createBlankNode() - throw (uno::RuntimeException, std::exception) override; + virtual uno::Reference< rdf::XBlankNode > SAL_CALL createBlankNode() override; virtual uno::Reference<rdf::XNamedGraph> SAL_CALL importGraph( ::sal_Int16 i_Format, const uno::Reference< io::XInputStream > & i_xInStream, const uno::Reference< rdf::XURI > & i_xGraphName, - const uno::Reference< rdf::XURI > & i_xBaseURI) - throw (uno::RuntimeException, lang::IllegalArgumentException, - datatransfer::UnsupportedFlavorException, - container::ElementExistException, rdf::ParseException, - rdf::RepositoryException, io::IOException, std::exception) override; + const uno::Reference< rdf::XURI > & i_xBaseURI) override; virtual void SAL_CALL exportGraph(::sal_Int16 i_Format, const uno::Reference< io::XOutputStream > & i_xOutStream, const uno::Reference< rdf::XURI > & i_xGraphName, - const uno::Reference< rdf::XURI > & i_xBaseURI) - throw (uno::RuntimeException, lang::IllegalArgumentException, - datatransfer::UnsupportedFlavorException, - container::NoSuchElementException, rdf::RepositoryException, - io::IOException, std::exception) override; + const uno::Reference< rdf::XURI > & i_xBaseURI) override; virtual uno::Sequence< uno::Reference< rdf::XURI > > SAL_CALL - getGraphNames() throw (uno::RuntimeException, rdf::RepositoryException, std::exception) override; + getGraphNames() override; virtual uno::Reference< rdf::XNamedGraph > SAL_CALL getGraph( - const uno::Reference< rdf::XURI > & i_xGraphName) - throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception) override; + const uno::Reference< rdf::XURI > & i_xGraphName) override; virtual uno::Reference< rdf::XNamedGraph > SAL_CALL createGraph( - const uno::Reference< rdf::XURI > & i_xGraphName) - throw (uno::RuntimeException, lang::IllegalArgumentException, - container::ElementExistException, rdf::RepositoryException, std::exception) override; + const uno::Reference< rdf::XURI > & i_xGraphName) override; virtual void SAL_CALL destroyGraph( - const uno::Reference< rdf::XURI > & i_xGraphName) - throw (uno::RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException, rdf::RepositoryException, std::exception) override; + const uno::Reference< rdf::XURI > & i_xGraphName) override; virtual uno::Reference< container::XEnumeration > SAL_CALL getStatements( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, - const uno::Reference< rdf::XNode > & i_xObject) - throw (uno::RuntimeException, - rdf::RepositoryException, std::exception) override; + const uno::Reference< rdf::XNode > & i_xObject) override; virtual uno::Reference< rdf::XQuerySelectResult > SAL_CALL - querySelect(const OUString & i_rQuery) - throw (uno::RuntimeException, rdf::QueryException, - rdf::RepositoryException, std::exception) override; + querySelect(const OUString & i_rQuery) override; virtual uno::Reference< container::XEnumeration > SAL_CALL - queryConstruct(const OUString & i_rQuery) - throw (uno::RuntimeException, rdf::QueryException, - rdf::RepositoryException, std::exception) override; - virtual sal_Bool SAL_CALL queryAsk(const OUString & i_rQuery) - throw (uno::RuntimeException, rdf::QueryException, - rdf::RepositoryException, std::exception) override; + queryConstruct(const OUString & i_rQuery) override; + virtual sal_Bool SAL_CALL queryAsk(const OUString & i_rQuery) override; // css::rdf::XDocumentRepository: virtual void SAL_CALL setStatementRDFa( @@ -337,29 +313,20 @@ public: const uno::Sequence< uno::Reference< rdf::XURI > > & i_rPredicates, const uno::Reference< rdf::XMetadatable > & i_xObject, const OUString & i_rRDFaContent, - const uno::Reference< rdf::XURI > & i_xRDFaDatatype) - throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception) override; + const uno::Reference< rdf::XURI > & i_xRDFaDatatype) override; virtual void SAL_CALL removeStatementRDFa( - const uno::Reference< rdf::XMetadatable > & i_xElement) - throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception) override; + const uno::Reference< rdf::XMetadatable > & i_xElement) override; virtual beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool > SAL_CALL - getStatementRDFa(uno::Reference< rdf::XMetadatable > const& i_xElement) - throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception) override; + getStatementRDFa(uno::Reference< rdf::XMetadatable > const& i_xElement) override; virtual uno::Reference< container::XEnumeration > SAL_CALL getStatementsRDFa( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, - const uno::Reference< rdf::XNode > & i_xObject) - throw (uno::RuntimeException, - rdf::RepositoryException, std::exception) override; + const uno::Reference< rdf::XNode > & i_xObject) override; // css::lang::XInitialization: virtual void SAL_CALL initialize( - const uno::Sequence< css::uno::Any > & i_rArguments) - throw (uno::RuntimeException, uno::Exception, std::exception) override; + const uno::Sequence< css::uno::Any > & i_rArguments) override; // XNamedGraph forwards --------------------------------------------- const NamedGraphMap_t::iterator clearGraph_NoLock( @@ -470,11 +437,8 @@ public: } // css::container::XEnumeration: - virtual sal_Bool SAL_CALL hasMoreElements() - throw (uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL nextElement() - throw (uno::RuntimeException, container::NoSuchElementException, - lang::WrappedTargetException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual uno::Any SAL_CALL nextElement() override; private: @@ -500,7 +464,7 @@ private: // css::container::XEnumeration: sal_Bool SAL_CALL -librdf_GraphResult::hasMoreElements() throw (uno::RuntimeException, std::exception) +librdf_GraphResult::hasMoreElements() { ::osl::MutexGuard g(m_rMutex); return m_pStream.get() && !librdf_stream_end(m_pStream.get()); @@ -523,8 +487,6 @@ librdf_node* librdf_GraphResult::getContext_Lock() const css::uno::Any SAL_CALL librdf_GraphResult::nextElement() -throw (uno::RuntimeException, container::NoSuchElementException, - lang::WrappedTargetException, std::exception) { ::osl::MutexGuard g(m_rMutex); if (!m_pStream.get() || !librdf_stream_end(m_pStream.get())) { @@ -584,15 +546,11 @@ public: } // css::container::XEnumeration: - virtual sal_Bool SAL_CALL hasMoreElements() - throw (uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL nextElement() - throw (uno::RuntimeException, container::NoSuchElementException, - lang::WrappedTargetException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual uno::Any SAL_CALL nextElement() override; // css::rdf::XQuerySelectResult: - virtual uno::Sequence< OUString > SAL_CALL getBindingNames() - throw (uno::RuntimeException, std::exception) override; + virtual uno::Sequence< OUString > SAL_CALL getBindingNames() override; private: @@ -615,7 +573,7 @@ private: // css::container::XEnumeration: sal_Bool SAL_CALL -librdf_QuerySelectResult::hasMoreElements() throw (uno::RuntimeException, std::exception) +librdf_QuerySelectResult::hasMoreElements() { ::osl::MutexGuard g(m_rMutex); return !librdf_query_results_finished(m_pQueryResult.get()); @@ -637,8 +595,6 @@ public: css::uno::Any SAL_CALL librdf_QuerySelectResult::nextElement() -throw (uno::RuntimeException, container::NoSuchElementException, - lang::WrappedTargetException, std::exception) { ::osl::MutexGuard g(m_rMutex); if (!librdf_query_results_finished(m_pQueryResult.get())) { @@ -674,7 +630,7 @@ throw (uno::RuntimeException, container::NoSuchElementException, // css::rdf::XQuerySelectResult: uno::Sequence< OUString > SAL_CALL -librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException, std::exception) +librdf_QuerySelectResult::getBindingNames() { // const - no lock needed return m_BindingNames; @@ -696,39 +652,27 @@ public: { }; // css::rdf::XNode: - virtual OUString SAL_CALL getStringValue() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getStringValue() override; // css::rdf::XURI: - virtual OUString SAL_CALL getNamespace() - throw (uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLocalName() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNamespace() override; + virtual OUString SAL_CALL getLocalName() override; // css::rdf::XNamedGraph: - virtual uno::Reference<rdf::XURI> SAL_CALL getName() - throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear() - throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException, std::exception) override; + virtual uno::Reference<rdf::XURI> SAL_CALL getName() override; + virtual void SAL_CALL clear() override; virtual void SAL_CALL addStatement( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, - const uno::Reference< rdf::XNode > & i_xObject) - throw (uno::RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException, rdf::RepositoryException, std::exception) override; + const uno::Reference< rdf::XNode > & i_xObject) override; virtual void SAL_CALL removeStatements( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, - const uno::Reference< rdf::XNode > & i_xObject) - throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException, std::exception) override; + const uno::Reference< rdf::XNode > & i_xObject) override; virtual uno::Reference< container::XEnumeration > SAL_CALL getStatements( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, - const uno::Reference< rdf::XNode > & i_xObject) - throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException, std::exception) override; + const uno::Reference< rdf::XNode > & i_xObject) override; private: @@ -744,34 +688,28 @@ private: // css::rdf::XNode: OUString SAL_CALL librdf_NamedGraph::getStringValue() -throw (uno::RuntimeException, std::exception) { return m_xName->getStringValue(); } // css::rdf::XURI: OUString SAL_CALL librdf_NamedGraph::getNamespace() -throw (uno::RuntimeException, std::exception) { return m_xName->getNamespace(); } OUString SAL_CALL librdf_NamedGraph::getLocalName() -throw (uno::RuntimeException, std::exception) { return m_xName->getLocalName(); } // css::rdf::XNamedGraph: uno::Reference< rdf::XURI > SAL_CALL librdf_NamedGraph::getName() -throw (uno::RuntimeException, std::exception) { return m_xName; } void SAL_CALL librdf_NamedGraph::clear() -throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException, std::exception) { uno::Reference< rdf::XRepository > xRep( m_wRep ); if (!xRep.is()) { @@ -790,8 +728,6 @@ void SAL_CALL librdf_NamedGraph::addStatement( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) -throw (uno::RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException, rdf::RepositoryException, std::exception) { uno::Reference< rdf::XRepository > xRep( m_wRep ); if (!xRep.is()) { @@ -806,8 +742,6 @@ void SAL_CALL librdf_NamedGraph::removeStatements( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) -throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException, std::exception) { uno::Reference< rdf::XRepository > xRep( m_wRep ); if (!xRep.is()) { @@ -823,8 +757,6 @@ librdf_NamedGraph::getStatements( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) -throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException, std::exception) { uno::Reference< rdf::XRepository > xRep( m_wRep ); if (!xRep.is()) { @@ -878,26 +810,24 @@ librdf_Repository::~librdf_Repository() // com.sun.star.uno.XServiceInfo: OUString SAL_CALL librdf_Repository::getImplementationName() -throw (uno::RuntimeException, std::exception) { return comp_librdf_Repository::_getImplementationName(); } sal_Bool SAL_CALL librdf_Repository::supportsService( - OUString const & serviceName) throw (uno::RuntimeException, std::exception) + OUString const & serviceName) { return cppu::supportsService(this, serviceName); } uno::Sequence< OUString > SAL_CALL -librdf_Repository::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +librdf_Repository::getSupportedServiceNames() { return comp_librdf_Repository::_getSupportedServiceNames(); } // css::rdf::XRepository: uno::Reference< rdf::XBlankNode > SAL_CALL librdf_Repository::createBlankNode() -throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); const std::shared_ptr<librdf_node> pNode( @@ -937,10 +867,6 @@ librdf_Repository::importGraph(::sal_Int16 i_Format, const uno::Reference< io::XInputStream > & i_xInStream, const uno::Reference< rdf::XURI > & i_xGraphName, const uno::Reference< rdf::XURI > & i_xBaseURI) -throw (uno::RuntimeException, lang::IllegalArgumentException, - datatransfer::UnsupportedFlavorException, - container::ElementExistException, rdf::ParseException, - rdf::RepositoryException, io::IOException, std::exception) { if (!i_xInStream.is()) { throw lang::IllegalArgumentException( @@ -1092,10 +1018,6 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format, const uno::Reference< io::XOutputStream > & i_xOutStream, const uno::Reference< rdf::XURI > & i_xGraphName, const uno::Reference< rdf::XURI > & i_xBaseURI) -throw (uno::RuntimeException, lang::IllegalArgumentException, - datatransfer::UnsupportedFlavorException, - container::NoSuchElementException, rdf::RepositoryException, - io::IOException, std::exception) { if (!i_xOutStream.is()) { throw lang::IllegalArgumentException( @@ -1235,7 +1157,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, uno::Sequence< uno::Reference< rdf::XURI > > SAL_CALL librdf_Repository::getGraphNames() -throw (uno::RuntimeException, rdf::RepositoryException, std::exception) { ::osl::MutexGuard g(m_aMutex); ::std::vector< uno::Reference<rdf::XURI> > ret; @@ -1248,8 +1169,6 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception) uno::Reference< rdf::XNamedGraph > SAL_CALL librdf_Repository::getGraph(const uno::Reference< rdf::XURI > & i_xGraphName) -throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception) { if (!i_xGraphName.is()) { throw lang::IllegalArgumentException( @@ -1268,8 +1187,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, uno::Reference< rdf::XNamedGraph > SAL_CALL librdf_Repository::createGraph(const uno::Reference< rdf::XURI > & i_xGraphName) -throw (uno::RuntimeException, lang::IllegalArgumentException, - container::ElementExistException, rdf::RepositoryException, std::exception) { if (!i_xGraphName.is()) { throw lang::IllegalArgumentException( @@ -1302,8 +1219,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, void SAL_CALL librdf_Repository::destroyGraph( const uno::Reference< rdf::XURI > & i_xGraphName) -throw (uno::RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException, rdf::RepositoryException, std::exception) { if (!i_xGraphName.is()) { throw lang::IllegalArgumentException( @@ -1329,7 +1244,6 @@ librdf_Repository::getStatements( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) -throw (uno::RuntimeException, rdf::RepositoryException, std::exception) { if (isMetadatableWithoutMetadata(i_xSubject) || isMetadatableWithoutMetadata(i_xPredicate) || @@ -1367,7 +1281,6 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception) uno::Reference< rdf::XQuerySelectResult > SAL_CALL librdf_Repository::querySelect(const OUString & i_rQuery) -throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std::exception) { ::osl::MutexGuard g(m_aMutex); const OString query( @@ -1416,7 +1329,6 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std uno::Reference< container::XEnumeration > SAL_CALL librdf_Repository::queryConstruct(const OUString & i_rQuery) -throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std::exception) { ::osl::MutexGuard g(m_aMutex); const OString query( @@ -1453,7 +1365,6 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std sal_Bool SAL_CALL librdf_Repository::queryAsk(const OUString & i_rQuery) -throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std::exception) { ::osl::MutexGuard g(m_aMutex); @@ -1486,8 +1397,6 @@ void SAL_CALL librdf_Repository::setStatementRDFa( const uno::Reference< rdf::XMetadatable > & i_xObject, const OUString & i_rRDFaContent, const uno::Reference< rdf::XURI > & i_xRDFaDatatype) -throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception) { if (!i_xSubject.is()) { throw lang::IllegalArgumentException( @@ -1602,8 +1511,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, void SAL_CALL librdf_Repository::removeStatementRDFa( const uno::Reference< rdf::XMetadatable > & i_xElement) -throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception) { if (!i_xElement.is()) { throw lang::IllegalArgumentException( @@ -1624,8 +1531,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool > SAL_CALL librdf_Repository::getStatementRDFa( const uno::Reference< rdf::XMetadatable > & i_xElement) -throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception) { if (!i_xElement.is()) { throw lang::IllegalArgumentException( @@ -1700,7 +1605,6 @@ librdf_Repository::getStatementsRDFa( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) -throw (uno::RuntimeException, rdf::RepositoryException, std::exception) { if (isMetadatableWithoutMetadata(i_xSubject) || isMetadatableWithoutMetadata(i_xPredicate) || @@ -1745,7 +1649,6 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception) // css::lang::XInitialization: void SAL_CALL librdf_Repository::initialize( const uno::Sequence< css::uno::Any > & i_rArguments) -throw (uno::RuntimeException, uno::Exception, std::exception) { (void) i_rArguments; diff --git a/unoxml/source/xpath/nodelist.cxx b/unoxml/source/xpath/nodelist.cxx index 766a96e80ee9..93fcc111d87f 100644 --- a/unoxml/source/xpath/nodelist.cxx +++ b/unoxml/source/xpath/nodelist.cxx @@ -44,7 +44,7 @@ namespace XPath /** The number of nodes in the list. */ - sal_Int32 SAL_CALL CNodeList::getLength() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CNodeList::getLength() { ::osl::MutexGuard const g(m_rMutex); @@ -58,7 +58,6 @@ namespace XPath Returns the indexth item in the collection. */ Reference< XNode > SAL_CALL CNodeList::item(sal_Int32 index) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); diff --git a/unoxml/source/xpath/nodelist.hxx b/unoxml/source/xpath/nodelist.hxx index c2dffe44fc33..c4582624ab8f 100644 --- a/unoxml/source/xpath/nodelist.hxx +++ b/unoxml/source/xpath/nodelist.hxx @@ -60,12 +60,11 @@ namespace XPath /** The number of nodes in the list. */ - virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLength() override; /** Returns the indexth item in the collection. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) override; }; } diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index 345623241a3f..faf243b6ff69 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -79,19 +79,16 @@ namespace XPath } Sequence< OUString > SAL_CALL CXPathAPI::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return CXPathAPI::_getSupportedServiceNames(); } OUString SAL_CALL CXPathAPI::getImplementationName() - throw (RuntimeException, std::exception) { return CXPathAPI::_getImplementationName(); } sal_Bool SAL_CALL CXPathAPI::supportsService(const OUString& aServiceName) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, aServiceName); } @@ -99,7 +96,6 @@ namespace XPath void SAL_CALL CXPathAPI::registerNS( const OUString& aPrefix, const OUString& aURI) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -109,7 +105,6 @@ namespace XPath void SAL_CALL CXPathAPI::unregisterNS( const OUString& aPrefix, const OUString& aURI) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -213,7 +208,6 @@ namespace XPath Reference< XNodeList > SAL_CALL CXPathAPI::selectNodeList( const Reference< XNode >& contextNode, const OUString& expr) - throw (RuntimeException, XPathException, std::exception) { Reference< XXPathObject > xobj = eval(contextNode, expr); return xobj->getNodeList(); @@ -226,7 +220,6 @@ namespace XPath const Reference< XNode >& contextNode, const OUString& expr, const Reference< XNode >& namespaceNode) - throw (RuntimeException, XPathException, std::exception) { lcl_collectRegisterNamespaces(*this, namespaceNode); return selectNodeList(contextNode, expr); @@ -238,7 +231,6 @@ namespace XPath Reference< XNode > SAL_CALL CXPathAPI::selectSingleNode( const Reference< XNode >& contextNode, const OUString& expr) - throw (RuntimeException, XPathException, std::exception) { Reference< XNodeList > aList = selectNodeList(contextNode, expr); Reference< XNode > aNode = aList->item(0); @@ -253,7 +245,6 @@ namespace XPath const Reference< XNode >& contextNode, const OUString& expr, const Reference< XNode >& namespaceNode ) - throw (RuntimeException, XPathException, std::exception) { lcl_collectRegisterNamespaces(*this, namespaceNode); return selectSingleNode(contextNode, expr); @@ -316,7 +307,6 @@ namespace XPath Reference< XXPathObject > SAL_CALL CXPathAPI::eval( Reference< XNode > const& xContextNode, const OUString& expr) - throw (RuntimeException, XPathException, std::exception) { if (!xContextNode.is()) { throw RuntimeException(); } @@ -392,7 +382,6 @@ namespace XPath const Reference< XNode >& contextNode, const OUString& expr, const Reference< XNode >& namespaceNode) - throw (RuntimeException, XPathException, std::exception) { lcl_collectRegisterNamespaces(*this, namespaceNode); return eval(contextNode, expr); @@ -405,7 +394,6 @@ namespace XPath */ void SAL_CALL CXPathAPI::registerExtension( const OUString& aName) - throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -421,7 +409,6 @@ namespace XPath */ void SAL_CALL CXPathAPI::registerExtensionInstance( Reference< XXPathExtension> const& xExtension) - throw (RuntimeException, std::exception) { if (!xExtension.is()) { throw RuntimeException(); diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx index cf359dacacd4..c0e57f56e35d 100644 --- a/unoxml/source/xpath/xpathapi.hxx +++ b/unoxml/source/xpath/xpathapi.hxx @@ -79,54 +79,43 @@ namespace XPath rSMgr); // 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; // --- XXPathAPI --- - virtual void SAL_CALL registerNS(const OUString& aPrefix, const OUString& aURI) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerNS(const OUString& aPrefix, const OUString& aURI) override; - virtual void SAL_CALL unregisterNS(const OUString& aPrefix, const OUString& aURI) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unregisterNS(const OUString& aPrefix, const OUString& aURI) override; /** Use an XPath string to select a nodelist. */ - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL selectNodeList(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str) - throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL selectNodeList(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str) override; /** Use an XPath string to select a nodelist. */ - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL selectNodeListNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >& namespaceNode) - throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL selectNodeListNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >& namespaceNode) override; /** Use an XPath string to select a single node. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL selectSingleNode(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str) - throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL selectSingleNode(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str) override; /** Use an XPath string to select a single node. */ - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL selectSingleNodeNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >& namespaceNode) - throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL selectSingleNodeNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >& namespaceNode) override; - virtual css::uno::Reference< css::xml::xpath::XXPathObject > SAL_CALL eval(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str) - throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override; + virtual css::uno::Reference< css::xml::xpath::XXPathObject > SAL_CALL eval(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str) override; - virtual css::uno::Reference< css::xml::xpath::XXPathObject > SAL_CALL evalNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >& namespaceNode) - throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override; + virtual css::uno::Reference< css::xml::xpath::XXPathObject > SAL_CALL evalNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >& namespaceNode) override; - virtual void SAL_CALL registerExtension(const OUString& aName) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL registerExtensionInstance(const css::uno::Reference< css::xml::xpath::XXPathExtension>& aExtension) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerExtension(const OUString& aName) override; + virtual void SAL_CALL registerExtensionInstance(const css::uno::Reference< css::xml::xpath::XXPathExtension>& aExtension) override; }; } diff --git a/unoxml/source/xpath/xpathobject.cxx b/unoxml/source/xpath/xpathobject.cxx index 59f071313d29..000b3e55c35c 100644 --- a/unoxml/source/xpath/xpathobject.cxx +++ b/unoxml/source/xpath/xpathobject.cxx @@ -73,7 +73,7 @@ namespace XPath /** get object type */ - XPathObjectType CXPathObject::getObjectType() throw (RuntimeException, std::exception) + XPathObjectType CXPathObject::getObjectType() { return m_XPathObjectType; } @@ -82,7 +82,7 @@ namespace XPath get the nodes from a nodelist type object */ Reference< XNodeList > SAL_CALL - CXPathObject::getNodeList() throw (RuntimeException, std::exception) + CXPathObject::getNodeList() { ::osl::MutexGuard const g(m_rMutex); @@ -94,7 +94,7 @@ namespace XPath /** get value of a boolean object */ - sal_Bool SAL_CALL CXPathObject::getBoolean() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL CXPathObject::getBoolean() { ::osl::MutexGuard const g(m_rMutex); @@ -104,7 +104,7 @@ namespace XPath /** get number as byte */ - sal_Int8 SAL_CALL CXPathObject::getByte() throw (RuntimeException, std::exception) + sal_Int8 SAL_CALL CXPathObject::getByte() { ::osl::MutexGuard const g(m_rMutex); @@ -114,7 +114,7 @@ namespace XPath /** get number as short */ - sal_Int16 SAL_CALL CXPathObject::getShort() throw (RuntimeException, std::exception) + sal_Int16 SAL_CALL CXPathObject::getShort() { ::osl::MutexGuard const g(m_rMutex); @@ -124,7 +124,7 @@ namespace XPath /** get number as long */ - sal_Int32 SAL_CALL CXPathObject::getLong() throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL CXPathObject::getLong() { ::osl::MutexGuard const g(m_rMutex); @@ -134,7 +134,7 @@ namespace XPath /** get number as hyper */ - sal_Int64 SAL_CALL CXPathObject::getHyper() throw (RuntimeException, std::exception) + sal_Int64 SAL_CALL CXPathObject::getHyper() { ::osl::MutexGuard const g(m_rMutex); @@ -144,7 +144,7 @@ namespace XPath /** get number as float */ - float SAL_CALL CXPathObject::getFloat() throw (RuntimeException, std::exception) + float SAL_CALL CXPathObject::getFloat() { ::osl::MutexGuard const g(m_rMutex); @@ -154,7 +154,7 @@ namespace XPath /** get number as double */ - double SAL_CALL CXPathObject::getDouble() throw (RuntimeException, std::exception) + double SAL_CALL CXPathObject::getDouble() { ::osl::MutexGuard const g(m_rMutex); @@ -164,7 +164,7 @@ namespace XPath /** get string value */ - OUString SAL_CALL CXPathObject::getString() throw (RuntimeException, std::exception) + OUString SAL_CALL CXPathObject::getString() { ::osl::MutexGuard const g(m_rMutex); diff --git a/unoxml/source/xpath/xpathobject.hxx b/unoxml/source/xpath/xpathobject.hxx index 7d06dbb08597..41787c3bb705 100644 --- a/unoxml/source/xpath/xpathobject.hxx +++ b/unoxml/source/xpath/xpathobject.hxx @@ -56,53 +56,52 @@ namespace XPath /** get object type */ - virtual css::xml::xpath::XPathObjectType SAL_CALL getObjectType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::xml::xpath::XPathObjectType SAL_CALL getObjectType() override; /** get the nodes from a nodelist type object */ - virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getNodeList() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getNodeList() override; /** get value of a boolean object */ - virtual sal_Bool SAL_CALL getBoolean() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getBoolean() override; /** get number as byte */ - virtual sal_Int8 SAL_CALL getByte() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL getByte() override; /** get number as short */ - virtual sal_Int16 SAL_CALL getShort() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getShort() override; /** get number as long */ - virtual sal_Int32 SAL_CALL getLong() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLong() override; /** get number as hyper */ - virtual sal_Int64 SAL_CALL getHyper() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getHyper() override; /** get number as float */ - virtual float SAL_CALL getFloat() throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getFloat() override; /** get number as double */ - virtual double SAL_CALL getDouble() throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getDouble() override; /** get string value */ - virtual OUString SAL_CALL getString() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() override; }; } |