diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /unoxml/source | |
| parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'unoxml/source')
64 files changed, 990 insertions, 990 deletions
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index 4eaa92216056..44c6d1e2726f 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -74,17 +74,17 @@ namespace DOM } OUString SAL_CALL CAttr::getNodeName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getName(); } OUString SAL_CALL CAttr::getNodeValue() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getValue(); } OUString SAL_CALL CAttr::getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getName(); } @@ -93,7 +93,7 @@ namespace DOM /** Returns the name of this attribute. */ - OUString SAL_CALL CAttr::getName() throw (RuntimeException) + OUString SAL_CALL CAttr::getName() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -110,7 +110,7 @@ namespace DOM attribute is not in use. */ Reference< XElement > SAL_CALL CAttr::getOwnerElement() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -132,7 +132,7 @@ namespace DOM document, this is true; otherwise, it is false. */ sal_Bool SAL_CALL CAttr::getSpecified() - throw (RuntimeException) + throw (RuntimeException, std::exception) { // FIXME if this DOM implemenatation supported DTDs it would need // to check that this attribute is not default or something @@ -143,7 +143,7 @@ namespace DOM On retrieval, the value of the attribute is returned as a string. */ OUString SAL_CALL CAttr::getValue() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -164,7 +164,7 @@ namespace DOM Sets the value of the attribute from a string. */ void SAL_CALL CAttr::setValue(const OUString& value) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -212,7 +212,7 @@ namespace DOM } void SAL_CALL CAttr::setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -228,7 +228,7 @@ namespace DOM } OUString SAL_CALL CAttr::getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -245,7 +245,7 @@ namespace DOM } OUString SAL_CALL CAttr::getNamespaceURI() - throw (RuntimeException) + 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 c00c01f54902..e2eb3dedd491 100644 --- a/unoxml/source/dom/attr.hxx +++ b/unoxml/source/dom/attr.hxx @@ -64,144 +64,144 @@ namespace DOM /** Returns the name of this attribute. */ - virtual OUString SAL_CALL getName() throw (RuntimeException); + virtual OUString SAL_CALL getName() throw (RuntimeException, std::exception); /** The Element node this attribute is attached to or null if this attribute is not in use. */ - virtual Reference< XElement > SAL_CALL getOwnerElement() throw (RuntimeException); + virtual Reference< XElement > SAL_CALL getOwnerElement() throw (RuntimeException, std::exception); /** 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 (RuntimeException); + virtual sal_Bool SAL_CALL getSpecified()throw (RuntimeException, std::exception); /** On retrieval, the value of the attribute is returned as a string. */ - virtual OUString SAL_CALL getValue() throw (RuntimeException); + virtual OUString SAL_CALL getValue() throw (RuntimeException, std::exception); /** Sets the value of the attribute from a string. */ - virtual void SAL_CALL setValue(const OUString& value) throw (RuntimeException, DOMException); + virtual void SAL_CALL setValue(const OUString& value) throw (RuntimeException, DOMException, std::exception); // resolve uno inheritance problems... // overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getLocalName() - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::cloneNode(deep); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLastChild(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeType(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return setValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); }; } diff --git a/unoxml/source/dom/attributesmap.cxx b/unoxml/source/dom/attributesmap.cxx index 9c93f24a2d20..4514225ad499 100644 --- a/unoxml/source/dom/attributesmap.cxx +++ b/unoxml/source/dom/attributesmap.cxx @@ -37,7 +37,7 @@ namespace DOM /** The number of nodes in this map. */ - sal_Int32 SAL_CALL CAttributesMap::getLength() throw (RuntimeException) + sal_Int32 SAL_CALL CAttributesMap::getLength() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -59,7 +59,7 @@ namespace DOM Retrieves a node specified by local name */ Reference< XNode > SAL_CALL - CAttributesMap::getNamedItem(OUString const& name) throw (RuntimeException) + CAttributesMap::getNamedItem(OUString const& name) throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -91,7 +91,7 @@ namespace DOM Reference< XNode > SAL_CALL CAttributesMap::getNamedItemNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -126,7 +126,7 @@ namespace DOM Returns the indexth item in the map. */ Reference< XNode > SAL_CALL - CAttributesMap::item(sal_Int32 index) throw (RuntimeException) + CAttributesMap::item(sal_Int32 index) throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -157,7 +157,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CAttributesMap::removeNamedItem(OUString const& name) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // no MutexGuard needed: m_pElement is const Reference< XAttr > const xAttr(m_pElement->getAttributeNode(name)); @@ -178,7 +178,7 @@ namespace DOM Reference< XNode > SAL_CALL CAttributesMap::removeNamedItemNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // no MutexGuard needed: m_pElement is const Reference< XAttr > const xAttr( @@ -199,7 +199,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CAttributesMap::setNamedItem(Reference< XNode > const& xNode) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Reference< XAttr > const xAttr(xNode, UNO_QUERY); if (!xNode.is()) { @@ -219,7 +219,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CAttributesMap::setNamedItemNS(Reference< XNode > const& xNode) - throw (RuntimeException) + throw (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 3508524b2c2c..d481874a0d38 100644 --- a/unoxml/source/dom/attributesmap.hxx +++ b/unoxml/source/dom/attributesmap.hxx @@ -51,54 +51,54 @@ namespace DOM /** The number of nodes in this map. */ - virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException); + virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException, std::exception); /** Retrieves a node specified by local name */ virtual Reference< XNode > SAL_CALL getNamedItem(OUString const& name) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Retrieves a node specified by local name and namespace URI. */ virtual Reference< XNode > SAL_CALL getNamedItemNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Returns the indexth item in the map. */ virtual Reference< XNode > SAL_CALL item(sal_Int32 index) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Removes a node specified by name. */ virtual Reference< XNode > SAL_CALL removeNamedItem(OUString const& name) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** // Removes a node specified by local name and namespace URI. */ virtual Reference< XNode > SAL_CALL removeNamedItemNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** // Adds a node using its nodeName attribute. */ virtual Reference< XNode > SAL_CALL setNamedItem(Reference< XNode > const& arg) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Adds a node using its namespaceURI and localName. */ virtual Reference< XNode > SAL_CALL setNamedItemNS(Reference< XNode > const& arg) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; } diff --git a/unoxml/source/dom/cdatasection.cxx b/unoxml/source/dom/cdatasection.cxx index 6ea146fb6ad9..49ffabdaf6be 100644 --- a/unoxml/source/dom/cdatasection.cxx +++ b/unoxml/source/dom/cdatasection.cxx @@ -42,12 +42,12 @@ namespace DOM } } - OUString SAL_CALL CCDATASection::getNodeName()throw (RuntimeException) + OUString SAL_CALL CCDATASection::getNodeName()throw (RuntimeException, std::exception) { return OUString( "#cdata-section" ); } - OUString SAL_CALL CCDATASection::getNodeValue() throw (RuntimeException) + OUString SAL_CALL CCDATASection::getNodeValue() throw (RuntimeException, std::exception) { return CCharacterData::getData(); } diff --git a/unoxml/source/dom/cdatasection.hxx b/unoxml/source/dom/cdatasection.hxx index efd78789ad7a..de264c9556fc 100644 --- a/unoxml/source/dom/cdatasection.hxx +++ b/unoxml/source/dom/cdatasection.hxx @@ -48,47 +48,47 @@ namespace DOM virtual void saxify(const Reference< XDocumentHandler >& i_xHandler); virtual Reference< XText > SAL_CALL splitText(sal_Int32 offset) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CText::splitText(offset); } // --- delegations for XCharacterData virtual void SAL_CALL appendData(const OUString& arg) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::appendData(arg); } virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::deleteData(offset, count); } - virtual OUString SAL_CALL getData() throw (RuntimeException) + virtual OUString SAL_CALL getData() throw (RuntimeException, std::exception) { return CCharacterData::getData(); } - virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException) + virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException, std::exception) { return CCharacterData::getLength(); } virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::insertData(offset, arg); } virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::replaceData(offset, count, arg); } virtual void SAL_CALL setData(const OUString& data) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::setData(data); } virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::subStringData(offset, count); } @@ -96,125 +96,125 @@ namespace DOM // --- overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::cloneNode(deep); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLastChild(); } virtual OUString SAL_CALL getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLocalName(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeType(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CText::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx index 2282171e438b..648aaffdbac6 100644 --- a/unoxml/source/dom/characterdata.cxx +++ b/unoxml/source/dom/characterdata.cxx @@ -56,7 +56,7 @@ 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) + throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -75,7 +75,7 @@ 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) + throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -109,7 +109,7 @@ namespace DOM /** Return the character data of the node that implements this interface. */ - OUString SAL_CALL CCharacterData::getData() throw (RuntimeException) + OUString SAL_CALL CCharacterData::getData() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -129,7 +129,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) + sal_Int32 SAL_CALL CCharacterData::getLength() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -146,7 +146,7 @@ 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) + throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -181,7 +181,7 @@ namespace DOM with the specified string. */ void SAL_CALL CCharacterData::replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -216,7 +216,7 @@ namespace DOM Set the character data of the node that implements this interface. */ void SAL_CALL CCharacterData::setData(const OUString& data) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -235,7 +235,7 @@ namespace DOM Extracts a range of data from the node. */ OUString SAL_CALL CCharacterData::subStringData(sal_Int32 offset, sal_Int32 count) - throw (RuntimeException, DOMException) + 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 3ce25ebd67d7..b1924297f76a 100644 --- a/unoxml/source/dom/characterdata.hxx +++ b/unoxml/source/dom/characterdata.hxx @@ -57,175 +57,175 @@ namespace DOM Append the string to the end of the character data of the node. */ virtual void SAL_CALL appendData(const OUString& arg) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Remove a range of 16-bit units from the node. */ virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Return the character data of the node that implements this interface. */ - virtual OUString SAL_CALL getData() throw (RuntimeException); + virtual OUString SAL_CALL getData() throw (RuntimeException, std::exception); /** The number of 16-bit units that are available through data and the substringData method below. */ - virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException); + virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException, std::exception); /** Insert a string at the specified 16-bit unit offset. */ virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** 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 (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Set the character data of the node that implements this interface. */ virtual void SAL_CALL setData(const OUString& data) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Extracts a range of data from the node. */ virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); // --- delegation for XNode base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::cloneNode(deep); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLastChild(); } virtual OUString SAL_CALL getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLocalName(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNextSibling(); } virtual OUString SAL_CALL getNodeName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeName(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeType(); } virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getData(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return setData(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/childlist.cxx b/unoxml/source/dom/childlist.cxx index f98a6f5264d7..9f4235052229 100644 --- a/unoxml/source/dom/childlist.cxx +++ b/unoxml/source/dom/childlist.cxx @@ -37,7 +37,7 @@ namespace DOM /** The number of nodes in the list. */ - sal_Int32 SAL_CALL CChildList::getLength() throw (RuntimeException) + sal_Int32 SAL_CALL CChildList::getLength() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -61,7 +61,7 @@ namespace DOM Returns the indexth item in the collection. */ Reference< XNode > SAL_CALL CChildList::item(sal_Int32 index) - throw (RuntimeException) + 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 a0d7162323b6..ff1bd8a208ab 100644 --- a/unoxml/source/dom/childlist.hxx +++ b/unoxml/source/dom/childlist.hxx @@ -51,12 +51,12 @@ namespace DOM /** The number of nodes in the list. */ - virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException); + virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException, std::exception); /** Returns the indexth item in the collection. */ virtual Reference< XNode > SAL_CALL item(sal_Int32 index) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; } diff --git a/unoxml/source/dom/comment.cxx b/unoxml/source/dom/comment.cxx index 3c1fe101013c..325e9d10eb48 100644 --- a/unoxml/source/dom/comment.cxx +++ b/unoxml/source/dom/comment.cxx @@ -39,12 +39,12 @@ namespace DOM } } - OUString SAL_CALL CComment::getNodeName()throw (RuntimeException) + OUString SAL_CALL CComment::getNodeName()throw (RuntimeException, std::exception) { return OUString("#comment"); } - OUString SAL_CALL CComment::getNodeValue() throw (RuntimeException) + OUString SAL_CALL CComment::getNodeValue() throw (RuntimeException, std::exception) { return CCharacterData::getData(); } diff --git a/unoxml/source/dom/comment.hxx b/unoxml/source/dom/comment.hxx index fefabdcb4c10..8958ee7abbb5 100644 --- a/unoxml/source/dom/comment.hxx +++ b/unoxml/source/dom/comment.hxx @@ -50,40 +50,40 @@ namespace DOM // --- delegations for XCharacterData virtual void SAL_CALL appendData(const OUString& arg) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::appendData(arg); } virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::deleteData(offset, count); } - virtual OUString SAL_CALL getData() throw (RuntimeException) + virtual OUString SAL_CALL getData() throw (RuntimeException, std::exception) { return CCharacterData::getData(); } - virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException) + virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException, std::exception) { return CCharacterData::getLength(); } virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::insertData(offset, arg); } virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::replaceData(offset, count, arg); } virtual void SAL_CALL setData(const OUString& data) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::setData(data); } virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::subStringData(offset, count); } @@ -91,125 +91,125 @@ namespace DOM // --- overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::cloneNode(deep); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getLastChild(); } virtual OUString SAL_CALL getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getLocalName(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getNodeType(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CCharacterData::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::setPrefix(prefix); } diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index ff0306c42660..dbfdf455b7b4 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -316,7 +316,7 @@ namespace DOM void SAL_CALL CDocument::addListener(const Reference< XStreamListener >& aListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -324,7 +324,7 @@ namespace DOM } void SAL_CALL CDocument::removeListener(const Reference< XStreamListener >& aListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -361,7 +361,7 @@ namespace DOM } // extern "C" void SAL_CALL CDocument::start() - throw (RuntimeException) + throw (RuntimeException, std::exception) { listenerlist_t streamListeners; { @@ -402,20 +402,20 @@ namespace DOM } void SAL_CALL CDocument::terminate() - throw (RuntimeException) + throw (RuntimeException, std::exception) { // not supported } void SAL_CALL CDocument::setOutputStream( const Reference< XOutputStream >& aStream ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); m_rOutputStream = aStream; } - Reference< XOutputStream > SAL_CALL CDocument::getOutputStream() throw (RuntimeException) + Reference< XOutputStream > SAL_CALL CDocument::getOutputStream() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -424,7 +424,7 @@ namespace DOM // Creates an Attr of the given name. Reference< XAttr > SAL_CALL CDocument::createAttribute(const OUString& name) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -441,7 +441,7 @@ 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) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -476,7 +476,7 @@ namespace DOM // Creates a CDATASection node whose value is the specified string. Reference< XCDATASection > SAL_CALL CDocument::createCDATASection(const OUString& data) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -494,7 +494,7 @@ namespace DOM // Creates a Comment node given the specified string. Reference< XComment > SAL_CALL CDocument::createComment(const OUString& data) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -509,7 +509,7 @@ namespace DOM //Creates an empty DocumentFragment object. Reference< XDocumentFragment > SAL_CALL CDocument::createDocumentFragment() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -522,7 +522,7 @@ namespace DOM // Creates an element of the type specified. Reference< XElement > SAL_CALL CDocument::createElement(const OUString& tagName) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -538,7 +538,7 @@ 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) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -574,7 +574,7 @@ namespace DOM //Creates an EntityReference object. Reference< XEntityReference > SAL_CALL CDocument::createEntityReference(const OUString& name) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -591,7 +591,7 @@ namespace DOM // data strings. Reference< XProcessingInstruction > SAL_CALL CDocument::createProcessingInstruction( const OUString& target, const OUString& data) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -609,7 +609,7 @@ namespace DOM // Creates a Text node given the specified string. Reference< XText > SAL_CALL CDocument::createTextNode(const OUString& data) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -625,7 +625,7 @@ namespace DOM // The Document Type Declaration (see DocumentType) associated with this // document. Reference< XDocumentType > SAL_CALL CDocument::getDoctype() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -639,7 +639,7 @@ 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) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -680,7 +680,7 @@ namespace DOM // Returns the Element whose ID is given by elementId. Reference< XElement > SAL_CALL CDocument::getElementById(const OUString& elementId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -699,7 +699,7 @@ namespace DOM Reference< XNodeList > SAL_CALL CDocument::getElementsByTagName(OUString const& rTagname) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -710,7 +710,7 @@ namespace DOM Reference< XNodeList > SAL_CALL CDocument::getElementsByTagNameNS( OUString const& rNamespaceURI, OUString const& rLocalName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -721,7 +721,7 @@ namespace DOM } Reference< XDOMImplementation > SAL_CALL CDocument::getImplementation() - throw (RuntimeException) + throw (RuntimeException, std::exception) { // does not need mutex currently return Reference< XDOMImplementation >(CDOMImplementation::get()); @@ -906,7 +906,7 @@ namespace DOM Reference< XNode > SAL_CALL CDocument::importNode( Reference< XNode > const& xImportedNode, sal_Bool deep) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { if (!xImportedNode.is()) { throw RuntimeException(); } @@ -935,20 +935,20 @@ namespace DOM return xNode; } - OUString SAL_CALL CDocument::getNodeName()throw (RuntimeException) + OUString SAL_CALL CDocument::getNodeName()throw (RuntimeException, std::exception) { // does not need mutex currently return OUString("#document"); } - OUString SAL_CALL CDocument::getNodeValue() throw (RuntimeException) + OUString SAL_CALL CDocument::getNodeValue() throw (RuntimeException, std::exception) { // does not need mutex currently return OUString(); } Reference< XNode > SAL_CALL CDocument::cloneNode(sal_Bool bDeep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -963,7 +963,7 @@ namespace DOM return xRet; } - Reference< XEvent > SAL_CALL CDocument::createEvent(const OUString& aType) throw (RuntimeException) + Reference< XEvent > SAL_CALL CDocument::createEvent(const OUString& aType) throw (RuntimeException, std::exception) { // does not need mutex currently events::CEvent *pEvent = 0; @@ -992,7 +992,7 @@ namespace DOM void SAL_CALL CDocument::serialize( const Reference< XDocumentHandler >& i_xHandler, const Sequence< beans::StringPair >& i_rNamespaces) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -1021,7 +1021,7 @@ 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) + 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 9225a8447e0a..18853dfaf7fa 100644 --- a/unoxml/source/dom/document.hxx +++ b/unoxml/source/dom/document.hxx @@ -128,49 +128,49 @@ namespace DOM Creates an Attr of the given name. */ virtual Reference< XAttr > SAL_CALL createAttribute(const OUString& name) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Creates an attribute of the given qualified name and namespace URI. */ virtual Reference< XAttr > SAL_CALL createAttributeNS(const OUString& namespaceURI, const OUString& qualifiedName) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Creates a CDATASection node whose value is the specified string. */ virtual Reference< XCDATASection > SAL_CALL createCDATASection(const OUString& data) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Creates a Comment node given the specified string. */ virtual Reference< XComment > SAL_CALL createComment(const OUString& data) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Creates an empty DocumentFragment object. */ virtual Reference< XDocumentFragment > SAL_CALL createDocumentFragment() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Creates an element of the type specified. */ virtual Reference< XElement > SAL_CALL createElement(const OUString& tagName) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Creates an element of the given qualified name and namespace URI. */ virtual Reference< XElement > SAL_CALL createElementNS(const OUString& namespaceURI, const OUString& qualifiedName) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Creates an EntityReference object. */ virtual Reference< XEntityReference > SAL_CALL createEntityReference(const OUString& name) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Creates a ProcessingInstruction node given the specified name and @@ -178,33 +178,33 @@ namespace DOM */ virtual Reference< XProcessingInstruction > SAL_CALL createProcessingInstruction( const OUString& target, const OUString& data) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Creates a Text node given the specified string. */ virtual Reference< XText > SAL_CALL createTextNode(const OUString& data) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** The Document Type Declaration (see DocumentType) associated with this document. */ virtual Reference< XDocumentType > SAL_CALL getDoctype() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** This is a convenience attribute that allows direct access to the child node that is the root element of the document. */ virtual Reference< XElement > SAL_CALL getDocumentElement() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Returns the Element whose ID is given by elementId. */ virtual Reference< XElement > SAL_CALL getElementById(const OUString& elementId) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Returns a NodeList of all the Elements with a given tag name in the @@ -212,7 +212,7 @@ namespace DOM Document tree. */ virtual Reference< XNodeList > SAL_CALL getElementsByTagName(const OUString& tagname) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Returns a NodeList of all the Elements with a given local name and @@ -220,153 +220,153 @@ namespace DOM traversal of the Document tree. */ virtual Reference< XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI, const OUString& localName) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** The DOMImplementation object that handles this document. */ virtual Reference< XDOMImplementation > SAL_CALL getImplementation() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Imports a node from another document to this document. */ virtual Reference< XNode > SAL_CALL importNode(const Reference< XNode >& importedNode, sal_Bool deep) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); // XDocumentEvent - virtual Reference< XEvent > SAL_CALL createEvent(const OUString& eventType) throw (RuntimeException); + virtual Reference< XEvent > SAL_CALL createEvent(const OUString& eventType) throw (RuntimeException, std::exception); // XActiveDataControl, // see http://api.libreoffice.org/docs/common/ref/com/sun/star/io/XActiveDataControl.html - virtual void SAL_CALL addListener(const Reference< XStreamListener >& aListener ) throw (RuntimeException); - virtual void SAL_CALL removeListener(const Reference< XStreamListener >& aListener ) throw (RuntimeException); - virtual void SAL_CALL start() throw (RuntimeException); - virtual void SAL_CALL terminate() throw (RuntimeException); + virtual void SAL_CALL addListener(const Reference< XStreamListener >& aListener ) throw (RuntimeException, std::exception); + virtual void SAL_CALL removeListener(const Reference< XStreamListener >& aListener ) throw (RuntimeException, std::exception); + virtual void SAL_CALL start() throw (RuntimeException, std::exception); + virtual void SAL_CALL terminate() throw (RuntimeException, std::exception); // XActiveDataSource // see http://api.libreoffice.org/docs/common/ref/com/sun/star/io/XActiveDataSource.html - virtual void SAL_CALL setOutputStream( const Reference< XOutputStream >& aStream ) throw (RuntimeException); - virtual Reference< XOutputStream > SAL_CALL getOutputStream() throw (RuntimeException); + virtual void SAL_CALL setOutputStream( const Reference< XOutputStream >& aStream ) throw (RuntimeException, std::exception); + virtual Reference< XOutputStream > SAL_CALL getOutputStream() throw (RuntimeException, std::exception); // ---- resolve uno inheritance problems... // overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::appendChild(newChild); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLastChild(); } virtual OUString SAL_CALL getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLocalName(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeType(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setPrefix(prefix); } @@ -375,14 +375,14 @@ namespace DOM virtual void SAL_CALL serialize( const Reference< XDocumentHandler >& i_xHandler, const Sequence< beans::StringPair >& i_rNamespaces) - throw (RuntimeException, SAXException); + throw (RuntimeException, SAXException, std::exception); // ::com::sun::star::xml::sax::XFastSAXSerializable virtual void SAL_CALL fastSerialize( const Reference< XFastDocumentHandler >& handler, const Reference< XFastTokenHandler >& tokenHandler, const Sequence< beans::StringPair >& i_rNamespaces, const Sequence< beans::Pair< OUString, sal_Int32 > >& namespaces ) - throw (SAXException, RuntimeException); + throw (SAXException, RuntimeException, std::exception); }; } diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index eef5e387252c..d99836f649d8 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -59,7 +59,7 @@ namespace DOM { public: virtual InputSource SAL_CALL resolveEntity( const OUString& sPublicId, const OUString& sSystemId ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { InputSource is; is.sPublicId = sPublicId; @@ -119,44 +119,44 @@ namespace DOM } Sequence< OUString > SAL_CALL CDocumentBuilder::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CDocumentBuilder::_getSupportedServiceNames(); } OUString SAL_CALL CDocumentBuilder::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CDocumentBuilder::_getImplementationName(); } sal_Bool SAL_CALL CDocumentBuilder::supportsService(const OUString& aServiceName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, aServiceName); } Reference< XDOMImplementation > SAL_CALL CDocumentBuilder::getDOMImplementation() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return Reference< XDOMImplementation >(); } sal_Bool SAL_CALL CDocumentBuilder::isNamespaceAware() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL CDocumentBuilder::isValidating() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return sal_False; } Reference< XDocument > SAL_CALL CDocumentBuilder::newDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -305,7 +305,7 @@ namespace DOM } Reference< XDocument > SAL_CALL CDocumentBuilder::parse(const Reference< XInputStream >& is) - throw (RuntimeException, SAXParseException, IOException) + throw (RuntimeException, SAXParseException, IOException, std::exception) { if (!is.is()) { throw RuntimeException(); @@ -348,7 +348,7 @@ namespace DOM } Reference< XDocument > SAL_CALL CDocumentBuilder::parseURI(const OUString& sUri) - throw (RuntimeException, SAXParseException, IOException) + throw (RuntimeException, SAXParseException, IOException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -372,7 +372,7 @@ namespace DOM void SAL_CALL CDocumentBuilder::setEntityResolver(Reference< XEntityResolver > const& xER) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -389,7 +389,7 @@ namespace DOM void SAL_CALL CDocumentBuilder::setErrorHandler(Reference< XErrorHandler > const& xEH) - throw (RuntimeException) + 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 a44db313f7b4..eb810ffd5752 100644 --- a/unoxml/source/dom/documentbuilder.hxx +++ b/unoxml/source/dom/documentbuilder.hxx @@ -86,59 +86,59 @@ namespace DOM // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames () - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Obtain an instance of a DOMImplementation object. */ virtual Reference< XDOMImplementation > SAL_CALL getDOMImplementation() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Indicates whether or not this parser is configured to understand namespaces. */ virtual sal_Bool SAL_CALL isNamespaceAware() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Indicates whether or not this parser is configured to validate XML documents. */ virtual sal_Bool SAL_CALL isValidating() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Obtain a new instance of a DOM Document object to build a DOM tree with. */ virtual Reference< XDocument > SAL_CALL newDocument() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Parse the content of the given InputStream as an XML document and return a new DOM Document object. */ virtual Reference< XDocument > SAL_CALL parse(const Reference< XInputStream >& is) - throw (RuntimeException, SAXParseException, IOException); + throw (RuntimeException, SAXParseException, IOException, std::exception); /** Parse the content of the given URI as an XML document and return a new DOM Document object. */ virtual Reference< XDocument > SAL_CALL parseURI(const OUString& uri) - throw (RuntimeException, SAXParseException, IOException); + throw (RuntimeException, SAXParseException, IOException, std::exception); /** Specify the EntityResolver to be used to resolve entities present in the XML document to be parsed. */ virtual void SAL_CALL setEntityResolver(const Reference< XEntityResolver >& er) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Reference< XEntityResolver > SAL_CALL getEntityResolver() throw (RuntimeException); @@ -149,7 +149,7 @@ namespace DOM the XML document to be parsed. */ virtual void SAL_CALL setErrorHandler(const Reference< XErrorHandler >& eh) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; } diff --git a/unoxml/source/dom/documentfragment.cxx b/unoxml/source/dom/documentfragment.cxx index 5c476510073f..e885cb52ed6d 100644 --- a/unoxml/source/dom/documentfragment.cxx +++ b/unoxml/source/dom/documentfragment.cxx @@ -44,11 +44,11 @@ namespace DOM } } - OUString SAL_CALL CDocumentFragment::getNodeName()throw (RuntimeException) + OUString SAL_CALL CDocumentFragment::getNodeName()throw (RuntimeException, std::exception) { return OUString("#document-fragment"); } - OUString SAL_CALL CDocumentFragment::getNodeValue() throw (RuntimeException) + OUString SAL_CALL CDocumentFragment::getNodeValue() throw (RuntimeException, std::exception) { return OUString(); } diff --git a/unoxml/source/dom/documentfragment.hxx b/unoxml/source/dom/documentfragment.hxx index e3f9d9f0563b..72c42dccf5f4 100644 --- a/unoxml/source/dom/documentfragment.hxx +++ b/unoxml/source/dom/documentfragment.hxx @@ -51,124 +51,124 @@ namespace DOM // ---- resolve uno inheritance problems... // overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::cloneNode(deep); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLastChild(); } virtual OUString SAL_CALL getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLocalName(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeType(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/documenttype.cxx b/unoxml/source/dom/documenttype.cxx index 30a1e054c1ed..fcdc0d4ded3b 100644 --- a/unoxml/source/dom/documenttype.cxx +++ b/unoxml/source/dom/documenttype.cxx @@ -41,7 +41,7 @@ namespace DOM A NamedNodeMap containing the general entities, both external and internal, declared in the DTD. */ - Reference< XNamedNodeMap > SAL_CALL CDocumentType::getEntities() throw (RuntimeException) + Reference< XNamedNodeMap > SAL_CALL CDocumentType::getEntities() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -56,7 +56,7 @@ namespace DOM /** The internal subset as a string, or null if there is none. */ - OUString SAL_CALL CDocumentType::getInternalSubset() throw (RuntimeException) + OUString SAL_CALL CDocumentType::getInternalSubset() throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CDocumentType::getInternalSubset: not implemented (#i113683#)"); @@ -67,7 +67,7 @@ namespace DOM The name of DTD; i.e., the name immediately following the DOCTYPE keyword. */ - OUString SAL_CALL CDocumentType::getName() throw (RuntimeException) + OUString SAL_CALL CDocumentType::getName() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -82,7 +82,7 @@ namespace DOM /** A NamedNodeMap containing the notations declared in the DTD. */ - Reference< XNamedNodeMap > SAL_CALL CDocumentType::getNotations() throw (RuntimeException) + Reference< XNamedNodeMap > SAL_CALL CDocumentType::getNotations() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -97,7 +97,7 @@ namespace DOM /** The public identifier of the external subset. */ - OUString SAL_CALL CDocumentType::getPublicId() throw (RuntimeException) + OUString SAL_CALL CDocumentType::getPublicId() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -112,7 +112,7 @@ namespace DOM /** The system identifier of the external subset. */ - OUString SAL_CALL CDocumentType::getSystemId() throw (RuntimeException) + OUString SAL_CALL CDocumentType::getSystemId() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -124,12 +124,12 @@ namespace DOM return aId; } - OUString SAL_CALL CDocumentType::getNodeName()throw (RuntimeException) + OUString SAL_CALL CDocumentType::getNodeName()throw (RuntimeException, std::exception) { return getName(); } - OUString SAL_CALL CDocumentType::getNodeValue() throw (RuntimeException) + OUString SAL_CALL CDocumentType::getNodeValue() throw (RuntimeException, std::exception) { return OUString(); } diff --git a/unoxml/source/dom/documenttype.hxx b/unoxml/source/dom/documenttype.hxx index 559da965b961..025029821365 100644 --- a/unoxml/source/dom/documenttype.hxx +++ b/unoxml/source/dom/documenttype.hxx @@ -58,155 +58,155 @@ namespace DOM A NamedNodeMap containing the general entities, both external and internal, declared in the DTD. */ - virtual Reference< XNamedNodeMap > SAL_CALL getEntities() throw (RuntimeException); + virtual Reference< XNamedNodeMap > SAL_CALL getEntities() throw (RuntimeException, std::exception); /** The internal subset as a string, or null if there is none. */ - virtual OUString SAL_CALL getInternalSubset() throw (RuntimeException); + virtual OUString SAL_CALL getInternalSubset() throw (RuntimeException, std::exception); /** The name of DTD; i.e., the name immediately following the DOCTYPE keyword. */ - virtual OUString SAL_CALL getName() throw (RuntimeException); + virtual OUString SAL_CALL getName() throw (RuntimeException, std::exception); /** A NamedNodeMap containing the notations declared in the DTD. */ - virtual Reference< XNamedNodeMap > SAL_CALL getNotations() throw (RuntimeException); + virtual Reference< XNamedNodeMap > SAL_CALL getNotations() throw (RuntimeException, std::exception); /** The public identifier of the external subset. */ - virtual OUString SAL_CALL getPublicId() throw (RuntimeException); + virtual OUString SAL_CALL getPublicId() throw (RuntimeException, std::exception); /** The system identifier of the external subset. */ - virtual OUString SAL_CALL getSystemId() throw (RuntimeException); + virtual OUString SAL_CALL getSystemId() throw (RuntimeException, std::exception); // ---- resolve uno inheritance problems... // overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::cloneNode(deep); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLastChild(); } virtual OUString SAL_CALL getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLocalName(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeType(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/domimplementation.cxx b/unoxml/source/dom/domimplementation.cxx index 8b09e487d4ce..677e13cf2c50 100644 --- a/unoxml/source/dom/domimplementation.cxx +++ b/unoxml/source/dom/domimplementation.cxx @@ -48,7 +48,7 @@ namespace DOM OUString const& /*rNamespaceURI*/, OUString const& /*rQualifiedName*/, Reference< XDocumentType > const& /*xDoctype*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CDOMImplementation::createDocument: not implemented (#i113683#)"); @@ -61,7 +61,7 @@ namespace DOM Reference< XDocumentType > SAL_CALL CDOMImplementation::createDocumentType( OUString const& /*rQualifiedName*/, OUString const& /*rPublicId*/, OUString const& /*rSystemId*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CDOMImplementation::createDocumentType: " "not implemented (#i113683#)"); @@ -73,7 +73,7 @@ namespace DOM */ sal_Bool SAL_CALL CDOMImplementation::hasFeature(OUString const& /*feature*/, OUString const& /*ver*/) - throw (RuntimeException) + 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 08fec83b7aeb..ded909a2bbd0 100644 --- a/unoxml/source/dom/domimplementation.hxx +++ b/unoxml/source/dom/domimplementation.hxx @@ -50,19 +50,19 @@ namespace DOM Creates a DOM Document object of the specified type with its document element. */ virtual Reference <XDocument > SAL_CALL createDocument(const OUString& namespaceURI, const OUString& qualifiedName, const Reference< XDocumentType >& doctype) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Creates an empty DocumentType node. */ virtual Reference< XDocumentType > SAL_CALL createDocumentType(const OUString& qualifiedName, const OUString& publicId, const OUString& systemId) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Test if the DOM implementation implements a specific feature. */ virtual sal_Bool SAL_CALL hasFeature(const OUString& feature, const OUString& ver) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; } #endif diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index 06774446792b..c6171d731d51 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -226,7 +226,7 @@ namespace DOM return empty string if attribute is not set */ OUString SAL_CALL CElement::getAttribute(OUString const& name) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -249,7 +249,7 @@ namespace DOM Retrieves an attribute node by name. */ Reference< XAttr > SAL_CALL CElement::getAttributeNode(OUString const& name) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -275,7 +275,7 @@ namespace DOM */ Reference< XAttr > SAL_CALL CElement::getAttributeNodeNS( const OUString& namespaceURI, const OUString& localName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -306,7 +306,7 @@ namespace DOM OUString SAL_CALL CElement::getAttributeNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -337,7 +337,7 @@ namespace DOM */ Reference< XNodeList > SAL_CALL CElement::getElementsByTagName(OUString const& rLocalName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -354,7 +354,7 @@ namespace DOM Reference< XNodeList > SAL_CALL CElement::getElementsByTagNameNS( OUString const& rNamespaceURI, OUString const& rLocalName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -367,7 +367,7 @@ namespace DOM The name of the element. */ OUString SAL_CALL CElement::getTagName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -385,7 +385,7 @@ namespace DOM element or has a default value, false otherwise. */ sal_Bool SAL_CALL CElement::hasAttribute(OUString const& name) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -400,7 +400,7 @@ namespace DOM */ sal_Bool SAL_CALL CElement::hasAttributeNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -415,7 +415,7 @@ namespace DOM Removes an attribute by name. */ void SAL_CALL CElement::removeAttribute(OUString const& name) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -440,7 +440,7 @@ namespace DOM */ void SAL_CALL CElement::removeAttributeNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -470,7 +470,7 @@ namespace DOM */ Reference< XAttr > SAL_CALL CElement::removeAttributeNode(Reference< XAttr > const& oldAttr) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -589,7 +589,7 @@ namespace DOM Reference< XAttr > CElement::setAttributeNode(const Reference< XAttr >& newAttr) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return setAttributeNode_Impl_Lock(newAttr, false); } @@ -599,7 +599,7 @@ namespace DOM */ Reference< XAttr > CElement::setAttributeNodeNS(const Reference< XAttr >& newAttr) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return setAttributeNode_Impl_Lock(newAttr, true); } @@ -609,7 +609,7 @@ namespace DOM */ void SAL_CALL CElement::setAttribute(OUString const& name, OUString const& value) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -655,7 +655,7 @@ namespace DOM void SAL_CALL CElement::setAttributeNS(OUString const& namespaceURI, OUString const& qualifiedName, OUString const& value) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { if (namespaceURI.isEmpty()) throw RuntimeException(); @@ -732,7 +732,7 @@ namespace DOM } Reference< XNamedNodeMap > SAL_CALL - CElement::getAttributes() throw (RuntimeException) + CElement::getAttributes() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -741,12 +741,12 @@ namespace DOM return xMap; } - OUString SAL_CALL CElement::getNodeName()throw (RuntimeException) + OUString SAL_CALL CElement::getNodeName()throw (RuntimeException, std::exception) { return getLocalName(); } - OUString SAL_CALL CElement::getLocalName()throw (RuntimeException) + OUString SAL_CALL CElement::getLocalName()throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -759,7 +759,7 @@ namespace DOM return aName; } - OUString SAL_CALL CElement::getNodeValue() throw (RuntimeException) + OUString SAL_CALL CElement::getNodeValue() throw (RuntimeException, std::exception) { return OUString(); } diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx index 7ca517d9e825..fa55b8bdb681 100644 --- a/unoxml/source/dom/element.hxx +++ b/unoxml/source/dom/element.hxx @@ -63,25 +63,25 @@ namespace DOM Retrieves an attribute value by name. */ virtual OUString SAL_CALL getAttribute(const OUString& name) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Retrieves an attribute node by name. */ virtual Reference< XAttr > SAL_CALL getAttributeNode(const OUString& name) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Retrieves an Attr node by local name and namespace URI. */ virtual Reference< XAttr > SAL_CALL getAttributeNodeNS(const OUString& namespaceURI, const OUString& localName) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Retrieves an attribute value by local name and namespace URI. */ virtual OUString SAL_CALL getAttributeNS(const OUString& namespaceURI, const OUString& localName) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Returns a NodeList of all descendant Elements with a given tag name, @@ -89,7 +89,7 @@ namespace DOM encountered in a preorder traversal of this Element tree. */ virtual Reference< XNodeList > SAL_CALL getElementsByTagName(const OUString& name) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Returns a NodeList of all the descendant Elements with a given local @@ -98,70 +98,70 @@ namespace DOM */ virtual Reference< XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI, const OUString& localName) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** The name of the element. */ virtual OUString SAL_CALL getTagName() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** 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 (RuntimeException); + throw (RuntimeException, std::exception); /** 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 (RuntimeException); + throw (RuntimeException, std::exception); /** Removes an attribute by name. */ virtual void SAL_CALL removeAttribute(const OUString& name) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Removes the specified attribute node. */ virtual Reference< XAttr > SAL_CALL removeAttributeNode(const Reference< XAttr >& oldAttr) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Removes an attribute by local name and namespace URI. */ virtual void SAL_CALL removeAttributeNS(const OUString& namespaceURI, const OUString& localName) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Adds a new attribute. */ virtual void SAL_CALL setAttribute(const OUString& name, const OUString& value) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Adds a new attribute node. */ virtual Reference< XAttr > SAL_CALL setAttributeNode(const Reference< XAttr >& newAttr) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Adds a new attribute. */ virtual Reference< XAttr > SAL_CALL setAttributeNodeNS(const Reference< XAttr >& newAttr) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Adds a new attribute. */ virtual void SAL_CALL setAttributeNS( const OUString& namespaceURI, const OUString& qualifiedName, const OUString& value) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** sets the element name @@ -171,120 +171,120 @@ namespace DOM // overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getLocalName() - throw (RuntimeException); + throw (RuntimeException, std::exception); // resolve uno inheritance problems... // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::cloneNode(deep); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLastChild(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeType(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index 10c2144d04db..b49579cf7c53 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -104,7 +104,7 @@ namespace DOM /** The number of nodes in the list. */ - sal_Int32 SAL_CALL CElementList::getLength() throw (RuntimeException) + sal_Int32 SAL_CALL CElementList::getLength() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -118,7 +118,7 @@ namespace DOM Returns the indexth item in the collection. */ Reference< XNode > SAL_CALL CElementList::item(sal_Int32 index) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (index < 0) throw RuntimeException(); @@ -137,7 +137,7 @@ namespace DOM // tree mutations can change the list void SAL_CALL CElementList::handleEvent(Reference< XEvent > const&) - throw (RuntimeException) + 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 da8d99600c28..b875ca817277 100644 --- a/unoxml/source/dom/elementlist.hxx +++ b/unoxml/source/dom/elementlist.hxx @@ -72,16 +72,16 @@ namespace DOM /** The number of nodes in the list. */ - virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException); + virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException, std::exception); /** Returns the indexth item in the collection. */ virtual Reference< XNode > SAL_CALL item(sal_Int32 index) - throw (RuntimeException); + throw (RuntimeException, std::exception); // XEventListener virtual void SAL_CALL handleEvent(const Reference< XEvent >& evt) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; } diff --git a/unoxml/source/dom/entitiesmap.cxx b/unoxml/source/dom/entitiesmap.cxx index 34abbfae3152..88d09fb26cc0 100644 --- a/unoxml/source/dom/entitiesmap.cxx +++ b/unoxml/source/dom/entitiesmap.cxx @@ -32,7 +32,7 @@ namespace DOM /** The number of nodes in this map. */ - sal_Int32 SAL_CALL CEntitiesMap::getLength() throw (RuntimeException) + sal_Int32 SAL_CALL CEntitiesMap::getLength() throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::getLength: not implemented (#i113683#)"); @@ -43,7 +43,7 @@ namespace DOM Retrieves a node specified by local name */ Reference< XNode > SAL_CALL - CEntitiesMap::getNamedItem(OUString const& /*name*/) throw (RuntimeException) + CEntitiesMap::getNamedItem(OUString const& /*name*/) throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::getNamedItem: not implemented (#i113683#)"); @@ -56,7 +56,7 @@ namespace DOM Reference< XNode > SAL_CALL CEntitiesMap::getNamedItemNS( OUString const& /*namespaceURI*/, OUString const& /*localName*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::getNamedItemNS: not implemented (#i113683#)"); @@ -67,7 +67,7 @@ namespace DOM Returns the indexth item in the map. */ Reference< XNode > SAL_CALL - CEntitiesMap::item(sal_Int32 /*index*/) throw (RuntimeException) + CEntitiesMap::item(sal_Int32 /*index*/) throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::item: not implemented (#i113683#)"); return Reference< XNode >(); @@ -78,7 +78,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CEntitiesMap::removeNamedItem(OUString const& /*name*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::removeNamedItem: not implemented (#i113683#)"); @@ -91,7 +91,7 @@ namespace DOM Reference< XNode > SAL_CALL CEntitiesMap::removeNamedItemNS( OUString const& /*namespaceURI*/, OUString const& /*localName*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::removeNamedItemNS: not implemented (#i113683#)"); @@ -103,7 +103,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CEntitiesMap::setNamedItem(Reference< XNode > const& /*arg*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntitiesMap::setNamedItem: not implemented (#i113683#)"); @@ -115,7 +115,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CEntitiesMap::setNamedItemNS(Reference< XNode > const& /*arg*/) - throw (RuntimeException) + 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 aa9c47c7ec9b..76e641479218 100644 --- a/unoxml/source/dom/entitiesmap.hxx +++ b/unoxml/source/dom/entitiesmap.hxx @@ -49,53 +49,53 @@ namespace DOM /** The number of nodes in this map. */ - virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException); + virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException, std::exception); /** Retrieves a node specified by local name */ virtual Reference< XNode > SAL_CALL - getNamedItem(const OUString& name) throw (RuntimeException); + getNamedItem(const OUString& name) throw (RuntimeException, std::exception); /** Retrieves a node specified by local name and namespace URI. */ virtual Reference< XNode > SAL_CALL getNamedItemNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Returns the indexth item in the map. */ virtual Reference< XNode > SAL_CALL - item(sal_Int32 index) throw (RuntimeException); + item(sal_Int32 index) throw (RuntimeException, std::exception); /** Removes a node specified by name. */ virtual Reference< XNode > SAL_CALL - removeNamedItem(OUString const& name) throw (RuntimeException); + removeNamedItem(OUString const& name) throw (RuntimeException, std::exception); /** // Removes a node specified by local name and namespace URI. */ virtual Reference< XNode > SAL_CALL removeNamedItemNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** // Adds a node using its nodeName attribute. */ virtual Reference< XNode > SAL_CALL setNamedItem(Reference< XNode > const& arg) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Adds a node using its namespaceURI and localName. */ virtual Reference< XNode > SAL_CALL setNamedItemNS(Reference< XNode > const& arg) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; } diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx index 93d2e44ca868..7a56cfb6bc85 100644 --- a/unoxml/source/dom/entity.cxx +++ b/unoxml/source/dom/entity.cxx @@ -51,7 +51,7 @@ namespace DOM /** For unparsed entities, the name of the notation for the entity. */ - OUString SAL_CALL CEntity::getNotationName() throw (RuntimeException) + OUString SAL_CALL CEntity::getNotationName() throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CEntity::getNotationName: not implemented (#i113683#)"); @@ -61,7 +61,7 @@ namespace DOM /** The public identifier associated with the entity, if specified. */ - OUString SAL_CALL CEntity::getPublicId() throw (RuntimeException) + OUString SAL_CALL CEntity::getPublicId() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -76,7 +76,7 @@ namespace DOM /** The system identifier associated with the entity, if specified. */ - OUString SAL_CALL CEntity::getSystemId() throw (RuntimeException) + OUString SAL_CALL CEntity::getSystemId() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -87,7 +87,7 @@ namespace DOM } return aID; } - OUString SAL_CALL CEntity::getNodeName()throw (RuntimeException) + OUString SAL_CALL CEntity::getNodeName()throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -99,7 +99,7 @@ namespace DOM } return aName; } - OUString SAL_CALL CEntity::getNodeValue() throw (RuntimeException) + OUString SAL_CALL CEntity::getNodeValue() throw (RuntimeException, std::exception) { return OUString(); } diff --git a/unoxml/source/dom/entity.hxx b/unoxml/source/dom/entity.hxx index edc0892449f9..abb2fc7fb86f 100644 --- a/unoxml/source/dom/entity.hxx +++ b/unoxml/source/dom/entity.hxx @@ -57,139 +57,139 @@ namespace DOM /** For unparsed entities, the name of the notation for the entity. */ - virtual OUString SAL_CALL getNotationName() throw (RuntimeException); + virtual OUString SAL_CALL getNotationName() throw (RuntimeException, std::exception); /** The public identifier associated with the entity, if specified. */ - virtual OUString SAL_CALL getPublicId() throw (RuntimeException); + virtual OUString SAL_CALL getPublicId() throw (RuntimeException, std::exception); /** The system identifier associated with the entity, if specified. */ - virtual OUString SAL_CALL getSystemId() throw (RuntimeException); + virtual OUString SAL_CALL getSystemId() throw (RuntimeException, std::exception); // ---- resolve uno inheritance problems... // overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::cloneNode(deep); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLastChild(); } virtual OUString SAL_CALL getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLocalName(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeType(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/entityreference.cxx b/unoxml/source/dom/entityreference.cxx index e0576d0032c1..e8f2a3fe9b23 100644 --- a/unoxml/source/dom/entityreference.cxx +++ b/unoxml/source/dom/entityreference.cxx @@ -46,7 +46,7 @@ namespace DOM } } - OUString SAL_CALL CEntityReference::getNodeName()throw (RuntimeException) + OUString SAL_CALL CEntityReference::getNodeName()throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -59,7 +59,7 @@ namespace DOM return aName; } - OUString SAL_CALL CEntityReference::getNodeValue() throw (RuntimeException) + OUString SAL_CALL CEntityReference::getNodeValue() throw (RuntimeException, std::exception) { return OUString(); } diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx index 6a7e3a718db4..e1e5878ce310 100644 --- a/unoxml/source/dom/entityreference.hxx +++ b/unoxml/source/dom/entityreference.hxx @@ -53,124 +53,124 @@ namespace DOM // ---- resolve uno inheritance problems... // overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::cloneNode(deep); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLastChild(); } virtual OUString SAL_CALL getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLocalName(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeType(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index e68cd6afbf6d..ac386c3b5eb0 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -288,7 +288,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CNode::appendChild( Reference< XNode > const& xNewChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::ClearableMutexGuard guard(m_rMutex); @@ -390,7 +390,7 @@ namespace DOM constructor for nodes. */ Reference< XNode > SAL_CALL CNode::cloneNode(sal_Bool bDeep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -409,7 +409,7 @@ namespace DOM or null otherwise. */ Reference< XNamedNodeMap > SAL_CALL CNode::getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { // return empty reference; only element node may override this impl return Reference< XNamedNodeMap>(); @@ -419,7 +419,7 @@ namespace DOM A NodeList that contains all children of this node. */ Reference< XNodeList > SAL_CALL CNode::getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -434,7 +434,7 @@ namespace DOM The first child of this node. */ Reference< XNode > SAL_CALL CNode::getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -450,7 +450,7 @@ namespace DOM The last child of this node. */ Reference< XNode > SAL_CALL CNode::getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -466,7 +466,7 @@ namespace DOM Returns the local part of the qualified name of this node. */ OUString SAL_CALL CNode::getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { // see CElement/CAttr return OUString(); @@ -477,7 +477,7 @@ namespace DOM The namespace URI of this node, or null if it is unspecified. */ OUString SAL_CALL CNode::getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -496,7 +496,7 @@ namespace DOM The node immediately following this node. */ Reference< XNode > SAL_CALL CNode::getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -512,7 +512,7 @@ namespace DOM The name of this node, depending on its type; see the table above. */ OUString SAL_CALL CNode::getNodeName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { /* Interface nodeName nodeValue attributes @@ -540,7 +540,7 @@ namespace DOM A code representing the type of the underlying object, as defined above. */ NodeType SAL_CALL CNode::getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -551,7 +551,7 @@ namespace DOM The value of this node, depending on its type; see the table above. */ OUString SAL_CALL CNode::getNodeValue() - throw (RuntimeException) + throw (RuntimeException, std::exception) { OUString aValue; return aValue; @@ -561,7 +561,7 @@ namespace DOM The Document object associated with this node. */ Reference< XDocument > SAL_CALL CNode::getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -576,7 +576,7 @@ namespace DOM The parent of this node. */ Reference< XNode > SAL_CALL CNode::getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -592,7 +592,7 @@ namespace DOM The namespace prefix of this node, or null if it is unspecified. */ OUString SAL_CALL CNode::getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -613,7 +613,7 @@ namespace DOM The node immediately preceding this node. */ Reference< XNode > SAL_CALL CNode::getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -629,7 +629,7 @@ namespace DOM Returns whether this node (if it is an element) has any attributes. */ sal_Bool SAL_CALL CNode::hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -640,7 +640,7 @@ namespace DOM Returns whether this node has any children. */ sal_Bool SAL_CALL CNode::hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -652,7 +652,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CNode::insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { if (!newChild.is() || !refChild.is()) { throw RuntimeException(); } @@ -731,7 +731,7 @@ namespace DOM that feature is supported by this node. */ sal_Bool SAL_CALL CNode::isSupported(const OUString& /*feature*/, const OUString& /*ver*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNode::isSupported: not implemented (#i113683#)"); return sal_False; @@ -745,7 +745,7 @@ namespace DOM Text nodes nor empty Text nodes. */ void SAL_CALL CNode::normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { //XXX combine adjacent text nodes and remove empty ones OSL_ENSURE(false, "CNode::normalize: not implemented (#i113683#)"); @@ -757,7 +757,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CNode::removeChild(const Reference< XNode >& xOldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { if (!xOldChild.is()) { throw RuntimeException(); @@ -833,7 +833,7 @@ namespace DOM Reference< XNode > SAL_CALL CNode::replaceChild( Reference< XNode > const& xNewChild, Reference< XNode > const& xOldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { if (!xOldChild.is() || !xNewChild.is()) { throw RuntimeException(); @@ -950,7 +950,7 @@ 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) + throw (RuntimeException, DOMException, std::exception) { // use specific node implememntation // if we end up down here, something went wrong @@ -963,7 +963,7 @@ 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) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -989,7 +989,7 @@ namespace DOM void SAL_CALL CNode::addEventListener(const OUString& eventType, const Reference< com::sun::star::xml::dom::events::XEventListener >& listener, sal_Bool useCapture) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -1001,7 +1001,7 @@ namespace DOM void SAL_CALL CNode::removeEventListener(const OUString& eventType, const Reference< com::sun::star::xml::dom::events::XEventListener >& listener, sal_Bool useCapture) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -1011,7 +1011,7 @@ namespace DOM } sal_Bool SAL_CALL CNode::dispatchEvent(const Reference< XEvent >& evt) - throw(RuntimeException, EventException) + throw(RuntimeException, EventException, std::exception) { CDocument * pDocument; events::CEventDispatcher * pDispatcher; @@ -1030,7 +1030,7 @@ namespace DOM ::sal_Int64 SAL_CALL CNode::getSomething(Sequence< ::sal_Int8 > const& rId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if ((rId.getLength() == 16) && (0 == memcmp(theCNodeUnoTunnelId::get().getSeq().getConstArray(), diff --git a/unoxml/source/dom/node.hxx b/unoxml/source/dom/node.hxx index d3d2696fba74..ab97112bb5a0 100644 --- a/unoxml/source/dom/node.hxx +++ b/unoxml/source/dom/node.hxx @@ -153,127 +153,127 @@ namespace DOM */ virtual Reference< XNode > SAL_CALL appendChild(Reference< XNode > const& xNewChild) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Returns a duplicate of this node, i.e., serves as a generic copy constructor for nodes. */ virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** A NamedNodeMap containing the attributes of this node (if it is an Element) or null otherwise. */ virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** A NodeList that contains all children of this node. */ virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** The first child of this node. */ virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** The last child of this node. */ virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Returns the local part of the qualified name of this node. */ virtual OUString SAL_CALL getLocalName() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** The namespace URI of this node, or null if it is unspecified. */ virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** The node immediately following this node. */ virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** 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 (RuntimeException); + throw (RuntimeException, std::exception); /** A code representing the type of the underlying object, as defined above. */ virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** 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 (RuntimeException); + throw (RuntimeException, std::exception); /** The Document object associated with this node. */ virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** The parent of this node. */ virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** The namespace prefix of this node, or null if it is unspecified. */ virtual OUString SAL_CALL getPrefix() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** The node immediately preceding this node. */ virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Returns whether this node (if it is an element) has any attributes. */ virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Returns whether this node has any children. */ virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Inserts the node newChild before the existing child node refChild. */ virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** 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 (RuntimeException); + throw (RuntimeException, std::exception); /** Puts all Text nodes in the full depth of the sub-tree underneath this @@ -283,14 +283,14 @@ namespace DOM Text nodes nor empty Text nodes. */ virtual void SAL_CALL normalize() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Removes the child node indicated by oldChild from the list of children, and returns it. */ virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** Replaces the child node oldChild with newChild in the list of children, @@ -298,39 +298,39 @@ namespace DOM */ virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** The value of this node, depending on its type; see the table above. */ virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); /** The namespace prefix of this node, or null if it is unspecified. */ virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); // --- XEventTarget virtual void SAL_CALL addEventListener(const OUString& eventType, const Reference< XEventListener >& listener, sal_Bool useCapture) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL removeEventListener(const OUString& eventType, const Reference< XEventListener >& listener, sal_Bool useCapture) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual sal_Bool SAL_CALL dispatchEvent(const Reference< XEvent >& evt) - throw(RuntimeException, EventException); + throw(RuntimeException, EventException, std::exception); // --- XUnoTunnel virtual ::sal_Int64 SAL_CALL getSomething(Sequence< ::sal_Int8 > const& rId) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; /// eliminate redundant namespace declarations diff --git a/unoxml/source/dom/notation.cxx b/unoxml/source/dom/notation.cxx index 29501f7b88f9..e59f8d85bbc8 100644 --- a/unoxml/source/dom/notation.cxx +++ b/unoxml/source/dom/notation.cxx @@ -31,7 +31,7 @@ namespace DOM { } - OUString SAL_CALL CNotation::getPublicId() throw (RuntimeException) + OUString SAL_CALL CNotation::getPublicId() throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotation::getPublicId: not implemented (#i113683#)"); @@ -41,7 +41,7 @@ namespace DOM /** The system identifier of this notation. */ - OUString SAL_CALL CNotation::getSystemId() throw (RuntimeException) + OUString SAL_CALL CNotation::getSystemId() throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotation::getSystemId: not implemented (#i113683#)"); @@ -49,7 +49,7 @@ namespace DOM } - OUString SAL_CALL CNotation::getNodeName()throw (RuntimeException) + OUString SAL_CALL CNotation::getNodeName()throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -62,7 +62,7 @@ namespace DOM return aName; } - OUString SAL_CALL CNotation::getNodeValue() throw (RuntimeException) + OUString SAL_CALL CNotation::getNodeValue() throw (RuntimeException, std::exception) { return OUString(); } diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx index b7ab881e094c..df1b606fe5a1 100644 --- a/unoxml/source/dom/notation.hxx +++ b/unoxml/source/dom/notation.hxx @@ -51,134 +51,134 @@ namespace DOM /** The public identifier of this notation. */ - virtual OUString SAL_CALL getPublicId() throw (RuntimeException); + virtual OUString SAL_CALL getPublicId() throw (RuntimeException, std::exception); /** The system identifier of this notation. */ - virtual OUString SAL_CALL getSystemId() throw (RuntimeException); + virtual OUString SAL_CALL getSystemId() throw (RuntimeException, std::exception); // ---- resolve uno inheritance problems... // overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::cloneNode(deep); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLastChild(); } virtual OUString SAL_CALL getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLocalName(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeType(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/notationsmap.cxx b/unoxml/source/dom/notationsmap.cxx index e955c18a5ede..090ffa88a942 100644 --- a/unoxml/source/dom/notationsmap.cxx +++ b/unoxml/source/dom/notationsmap.cxx @@ -33,7 +33,7 @@ namespace DOM /** The number of nodes in this map. */ - sal_Int32 SAL_CALL CNotationsMap::getLength() throw (RuntimeException) + sal_Int32 SAL_CALL CNotationsMap::getLength() throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::getLength: not implemented (#i113683#)"); @@ -45,7 +45,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CNotationsMap::getNamedItem(OUString const& /*name*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::getNamedItem: not implemented (#i113683#)"); @@ -58,7 +58,7 @@ namespace DOM Reference< XNode > SAL_CALL CNotationsMap::getNamedItemNS( OUString const& /*namespaceURI*/, OUString const& /*localName*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::getNamedItemNS: not implemented (#i113683#)"); @@ -69,7 +69,7 @@ namespace DOM Returns the indexth item in the map. */ Reference< XNode > SAL_CALL - CNotationsMap::item(sal_Int32 /*index*/) throw (RuntimeException) + CNotationsMap::item(sal_Int32 /*index*/) throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::item: not implemented (#i113683#)"); return Reference< XNode >(); @@ -80,7 +80,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CNotationsMap::removeNamedItem(OUString const& /*name*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::removeNamedItem: not implemented (#i113683#)"); @@ -93,7 +93,7 @@ namespace DOM Reference< XNode > SAL_CALL CNotationsMap::removeNamedItemNS( OUString const& /*namespaceURI*/, OUString const& /*localName*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::removeNamedItemNS: not implemented (#i113683#)"); @@ -105,7 +105,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CNotationsMap::setNamedItem(Reference< XNode > const& /*arg*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(false, "CNotationsMap::setNamedItem: not implemented (#i113683#)"); @@ -117,7 +117,7 @@ namespace DOM */ Reference< XNode > SAL_CALL CNotationsMap::setNamedItemNS(Reference< XNode > const& /*arg*/) - throw (RuntimeException) + 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 0e7071e86af1..e3132639851e 100644 --- a/unoxml/source/dom/notationsmap.hxx +++ b/unoxml/source/dom/notationsmap.hxx @@ -49,53 +49,53 @@ namespace DOM /** The number of nodes in this map. */ - virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException); + virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException, std::exception); /** Retrieves a node specified by local name */ virtual Reference< XNode > SAL_CALL - getNamedItem(OUString const& name) throw (RuntimeException); + getNamedItem(OUString const& name) throw (RuntimeException, std::exception); /** Retrieves a node specified by local name and namespace URI. */ virtual Reference< XNode > SAL_CALL getNamedItemNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Returns the indexth item in the map. */ virtual Reference< XNode > SAL_CALL - item(sal_Int32 index) throw (RuntimeException); + item(sal_Int32 index) throw (RuntimeException, std::exception); /** Removes a node specified by name. */ virtual Reference< XNode > SAL_CALL - removeNamedItem(OUString const& name) throw (RuntimeException); + removeNamedItem(OUString const& name) throw (RuntimeException, std::exception); /** // Removes a node specified by local name and namespace URI. */ virtual Reference< XNode > SAL_CALL removeNamedItemNS( OUString const& namespaceURI, OUString const& localName) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** // Adds a node using its nodeName attribute. */ virtual Reference< XNode > SAL_CALL setNamedItem(Reference< XNode > const& arg) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Adds a node using its namespaceURI and localName. */ virtual Reference< XNode > SAL_CALL setNamedItemNS(Reference< XNode > const& arg) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; } diff --git a/unoxml/source/dom/processinginstruction.cxx b/unoxml/source/dom/processinginstruction.cxx index 99790e159c7c..b4b76d1b0000 100644 --- a/unoxml/source/dom/processinginstruction.cxx +++ b/unoxml/source/dom/processinginstruction.cxx @@ -47,7 +47,7 @@ namespace DOM The content of this processing instruction. */ OUString SAL_CALL - CProcessingInstruction::getData() throw (RuntimeException) + CProcessingInstruction::getData() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -68,7 +68,7 @@ namespace DOM The target of this processing instruction. */ OUString SAL_CALL - CProcessingInstruction::getTarget() throw (RuntimeException) + CProcessingInstruction::getTarget() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -89,7 +89,7 @@ namespace DOM The content of this processing instruction. */ void SAL_CALL CProcessingInstruction::setData(OUString const& rData) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -106,7 +106,7 @@ namespace DOM } OUString SAL_CALL - CProcessingInstruction::getNodeName() throw (RuntimeException) + CProcessingInstruction::getNodeName() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -121,14 +121,14 @@ namespace DOM } OUString SAL_CALL CProcessingInstruction::getNodeValue() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getData(); } void SAL_CALL CProcessingInstruction::setNodeValue(OUString const& rNodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return setData(rNodeValue); } diff --git a/unoxml/source/dom/processinginstruction.hxx b/unoxml/source/dom/processinginstruction.hxx index df298a04a3f9..d1687944cc9f 100644 --- a/unoxml/source/dom/processinginstruction.hxx +++ b/unoxml/source/dom/processinginstruction.hxx @@ -54,137 +54,137 @@ namespace DOM /** The content of this processing instruction. */ - virtual OUString SAL_CALL getData() throw (RuntimeException); + virtual OUString SAL_CALL getData() throw (RuntimeException, std::exception); /** The target of this processing instruction. */ - virtual OUString SAL_CALL getTarget() throw (RuntimeException); + virtual OUString SAL_CALL getTarget() throw (RuntimeException, std::exception); /** The content of this processing instruction. */ - virtual void SAL_CALL setData(const OUString& data) throw (RuntimeException, DOMException); + virtual void SAL_CALL setData(const OUString& data) throw (RuntimeException, DOMException, std::exception); // ---- resolve uno inheritance problems... // overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getNodeValue() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL setNodeValue(OUString const& rNodeValue) - throw (RuntimeException, DOMException); + throw (RuntimeException, DOMException, std::exception); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::cloneNode(deep); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLastChild(); } virtual OUString SAL_CALL getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getLocalName(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getNodeType(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CNode::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx index 33e79149e647..7bb5ac9c0530 100644 --- a/unoxml/source/dom/saxbuilder.cxx +++ b/unoxml/source/dom/saxbuilder.cxx @@ -59,25 +59,25 @@ namespace DOM } Sequence< OUString > SAL_CALL CSAXDocumentBuilder::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CSAXDocumentBuilder::_getSupportedServiceNames(); } OUString SAL_CALL CSAXDocumentBuilder::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CSAXDocumentBuilder::_getImplementationName(); } sal_Bool SAL_CALL CSAXDocumentBuilder::supportsService(const OUString& aServiceName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, aServiceName); } SAXDocumentBuilderState SAL_CALL CSAXDocumentBuilder::getState() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -85,7 +85,7 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::reset() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -97,7 +97,7 @@ namespace DOM } Reference< XDocument > SAL_CALL CSAXDocumentBuilder::getDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -108,7 +108,7 @@ namespace DOM } Reference< XDocumentFragment > SAL_CALL CSAXDocumentBuilder::getDocumentFragment() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -118,7 +118,7 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::startDocumentFragment(const Reference< XDocument >& ownerDoc) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -135,7 +135,7 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::endDocumentFragment() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -152,7 +152,7 @@ namespace DOM // document handler - void SAL_CALL CSAXDocumentBuilder::startDocument() throw (RuntimeException, SAXException) + void SAL_CALL CSAXDocumentBuilder::startDocument() throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -168,7 +168,7 @@ namespace DOM m_aState = SAXDocumentBuilderState_BUILDING_DOCUMENT; } - void SAL_CALL CSAXDocumentBuilder::endDocument() throw (RuntimeException, SAXException) + void SAL_CALL CSAXDocumentBuilder::endDocument() throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -184,7 +184,7 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::startElement(const OUString& aName, const Reference< XAttributeList>& attribs) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -287,7 +287,7 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::endElement(const OUString& aName) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -316,7 +316,7 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::characters(const OUString& aChars) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -330,7 +330,7 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::ignorableWhitespace(const OUString& ) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -341,7 +341,7 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::processingInstruction(const OUString& aTarget, const OUString& aData) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) { ::osl::MutexGuard g(m_Mutex); @@ -356,7 +356,7 @@ namespace DOM } void SAL_CALL CSAXDocumentBuilder::setDocumentLocator(const Reference< XLocator >& aLocator) - throw (RuntimeException, SAXException) + 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 69f320860f1d..c9ad2b9079e2 100644 --- a/unoxml/source/dom/saxbuilder.hxx +++ b/unoxml/source/dom/saxbuilder.hxx @@ -92,46 +92,46 @@ namespace DOM // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames () - throw (RuntimeException); + throw (RuntimeException, std::exception); // XDocumentHandler virtual void SAL_CALL startDocument() - throw( RuntimeException, com::sun::star::xml::sax::SAXException ); + throw( RuntimeException, com::sun::star::xml::sax::SAXException, std::exception ); virtual void SAL_CALL endDocument() - throw( RuntimeException, com::sun::star::xml::sax::SAXException ); + throw( RuntimeException, com::sun::star::xml::sax::SAXException, std::exception ); virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) - throw( RuntimeException, com::sun::star::xml::sax::SAXException ); + throw( RuntimeException, com::sun::star::xml::sax::SAXException, std::exception ); virtual void SAL_CALL endElement( const OUString& aName ) - throw( RuntimeException, com::sun::star::xml::sax::SAXException ); + throw( RuntimeException, com::sun::star::xml::sax::SAXException, std::exception ); virtual void SAL_CALL characters( const OUString& aChars ) - throw( RuntimeException, com::sun::star::xml::sax::SAXException ); + throw( RuntimeException, com::sun::star::xml::sax::SAXException, std::exception ); virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw( RuntimeException, com::sun::star::xml::sax::SAXException ); + throw( RuntimeException, com::sun::star::xml::sax::SAXException, std::exception ); virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw( RuntimeException, com::sun::star::xml::sax::SAXException ); + throw( RuntimeException, com::sun::star::xml::sax::SAXException, std::exception ); virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) - throw( RuntimeException, com::sun::star::xml::sax::SAXException ); + throw( RuntimeException, com::sun::star::xml::sax::SAXException, std::exception ); // XSAXDocumentBuilder virtual SAXDocumentBuilderState SAL_CALL getState() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL reset() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Reference< XDocument > SAL_CALL getDocument() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Reference< XDocumentFragment > SAL_CALL getDocumentFragment() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL startDocumentFragment(const Reference< XDocument >& ownerDoc) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL endDocumentFragment() - throw (RuntimeException); + throw (RuntimeException, std::exception); }; diff --git a/unoxml/source/dom/text.cxx b/unoxml/source/dom/text.cxx index 52df1b8e1c9a..4dd422ce6a96 100644 --- a/unoxml/source/dom/text.cxx +++ b/unoxml/source/dom/text.cxx @@ -53,13 +53,13 @@ namespace DOM } } - OUString SAL_CALL CText::getNodeName() throw (RuntimeException) + OUString SAL_CALL CText::getNodeName() throw (RuntimeException, std::exception) { return OUString("#text"); } Reference< XText > SAL_CALL CText::splitText(sal_Int32 /*offset*/) - throw (RuntimeException) + 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 08fb9c8f37c1..9ac9c051abf6 100644 --- a/unoxml/source/dom/text.hxx +++ b/unoxml/source/dom/text.hxx @@ -61,45 +61,45 @@ namespace DOM // Breaks this node into two nodes at the specified offset, keeping // both in the tree as siblings. virtual Reference< XText > SAL_CALL splitText(sal_Int32 offset) - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- delegations for XCharacterData virtual void SAL_CALL appendData(const OUString& arg) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::appendData(arg); } virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::deleteData(offset, count); } - virtual OUString SAL_CALL getData() throw (RuntimeException) + virtual OUString SAL_CALL getData() throw (RuntimeException, std::exception) { return CCharacterData::getData(); } - virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException) + virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException, std::exception) { return CCharacterData::getLength(); } virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::insertData(offset, arg); } virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::replaceData(offset, count, arg); } virtual void SAL_CALL setData(const OUString& data) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { CCharacterData::setData(data); } virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::subStringData(offset, count); } @@ -107,128 +107,128 @@ namespace DOM // --- overrides for XNode base virtual OUString SAL_CALL getNodeName() - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- resolve uno inheritance problems... // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::appendChild(newChild); } virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::cloneNode(deep); } virtual Reference< XNamedNodeMap > SAL_CALL getAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getAttributes(); } virtual Reference< XNodeList > SAL_CALL getChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getChildNodes(); } virtual Reference< XNode > SAL_CALL getFirstChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getFirstChild(); } virtual Reference< XNode > SAL_CALL getLastChild() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getLastChild(); } virtual OUString SAL_CALL getLocalName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getLocalName(); } virtual OUString SAL_CALL getNamespaceURI() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getNamespaceURI(); } virtual Reference< XNode > SAL_CALL getNextSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getNextSibling(); } virtual NodeType SAL_CALL getNodeType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getNodeType(); } - virtual OUString SAL_CALL getNodeValue() throw (RuntimeException) + virtual OUString SAL_CALL getNodeValue() throw (RuntimeException, std::exception) { return CCharacterData::getNodeValue(); } virtual Reference< XDocument > SAL_CALL getOwnerDocument() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getOwnerDocument(); } virtual Reference< XNode > SAL_CALL getParentNode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getParentNode(); } virtual OUString SAL_CALL getPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getPrefix(); } virtual Reference< XNode > SAL_CALL getPreviousSibling() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::getPreviousSibling(); } virtual sal_Bool SAL_CALL hasAttributes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::hasAttributes(); } virtual sal_Bool SAL_CALL hasChildNodes() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::hasChildNodes(); } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::insertBefore(newChild, refChild); } virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CCharacterData::isSupported(feature, ver); } virtual void SAL_CALL normalize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CCharacterData::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (RuntimeException, DOMException) + throw (RuntimeException, DOMException, std::exception) { return CCharacterData::setPrefix(prefix); } diff --git a/unoxml/source/events/event.cxx b/unoxml/source/events/event.cxx index 316d19a32ac5..cd66d0b3fd3e 100644 --- a/unoxml/source/events/event.cxx +++ b/unoxml/source/events/event.cxx @@ -34,64 +34,64 @@ namespace DOM { namespace events { } - OUString SAL_CALL CEvent::getType() throw (RuntimeException) + OUString SAL_CALL CEvent::getType() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_eventType; } Reference< XEventTarget > SAL_CALL - CEvent::getTarget() throw (RuntimeException) + CEvent::getTarget() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_target; } Reference< XEventTarget > SAL_CALL - CEvent::getCurrentTarget() throw (RuntimeException) + CEvent::getCurrentTarget() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_currentTarget; } - PhaseType SAL_CALL CEvent::getEventPhase() throw (RuntimeException) + PhaseType SAL_CALL CEvent::getEventPhase() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_phase; } - sal_Bool SAL_CALL CEvent::getBubbles() throw (RuntimeException) + sal_Bool SAL_CALL CEvent::getBubbles() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_bubbles; } - sal_Bool SAL_CALL CEvent::getCancelable() throw (RuntimeException) + sal_Bool SAL_CALL CEvent::getCancelable() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_cancelable; } com::sun::star::util::Time SAL_CALL - CEvent::getTimeStamp() throw (RuntimeException) + CEvent::getTimeStamp() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_time; } - void SAL_CALL CEvent::stopPropagation() throw (RuntimeException) + void SAL_CALL CEvent::stopPropagation() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); if (m_cancelable) { m_canceled = sal_True; } } - void SAL_CALL CEvent::preventDefault() throw (RuntimeException) + void SAL_CALL CEvent::preventDefault() throw (RuntimeException, std::exception) { } void SAL_CALL CEvent::initEvent(OUString const& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (RuntimeException) + sal_Bool cancelableArg) throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx index bb9391309de4..a148e20c9902 100644 --- a/unoxml/source/events/event.hxx +++ b/unoxml/source/events/event.hxx @@ -59,19 +59,19 @@ public: explicit CEvent(); virtual ~CEvent(); - virtual OUString SAL_CALL getType() throw (RuntimeException); - virtual Reference< XEventTarget > SAL_CALL getTarget() throw (RuntimeException); - virtual Reference< XEventTarget > SAL_CALL getCurrentTarget() throw (RuntimeException); - virtual PhaseType SAL_CALL getEventPhase() throw (RuntimeException); - virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException); - virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException); - virtual com::sun::star::util::Time SAL_CALL getTimeStamp() throw (RuntimeException); - virtual void SAL_CALL stopPropagation() throw (RuntimeException); - virtual void SAL_CALL preventDefault() throw (RuntimeException); + virtual OUString SAL_CALL getType() throw (RuntimeException, std::exception); + virtual Reference< XEventTarget > SAL_CALL getTarget() throw (RuntimeException, std::exception); + virtual Reference< XEventTarget > SAL_CALL getCurrentTarget() throw (RuntimeException, std::exception); + virtual PhaseType SAL_CALL getEventPhase() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException, std::exception); + virtual com::sun::star::util::Time SAL_CALL getTimeStamp() throw (RuntimeException, std::exception); + virtual void SAL_CALL stopPropagation() throw (RuntimeException, std::exception); + virtual void SAL_CALL preventDefault() throw (RuntimeException, std::exception); virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (RuntimeException); + sal_Bool cancelableArg) throw (RuntimeException, std::exception); }; }} #endif diff --git a/unoxml/source/events/mouseevent.cxx b/unoxml/source/events/mouseevent.cxx index ea3bb13d0148..1b08b2743cc6 100644 --- a/unoxml/source/events/mouseevent.cxx +++ b/unoxml/source/events/mouseevent.cxx @@ -35,52 +35,52 @@ namespace DOM { namespace events { } - sal_Int32 SAL_CALL CMouseEvent::getScreenX() throw (RuntimeException) + sal_Int32 SAL_CALL CMouseEvent::getScreenX() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_screenX; } - sal_Int32 SAL_CALL CMouseEvent::getScreenY() throw (RuntimeException) + sal_Int32 SAL_CALL CMouseEvent::getScreenY() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_screenY; } - sal_Int32 SAL_CALL CMouseEvent::getClientX() throw (RuntimeException) + sal_Int32 SAL_CALL CMouseEvent::getClientX() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_clientX; } - sal_Int32 SAL_CALL CMouseEvent::getClientY() throw (RuntimeException) + sal_Int32 SAL_CALL CMouseEvent::getClientY() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_clientY; } - sal_Bool SAL_CALL CMouseEvent::getCtrlKey() throw (RuntimeException) + sal_Bool SAL_CALL CMouseEvent::getCtrlKey() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_ctrlKey; } - sal_Bool SAL_CALL CMouseEvent::getShiftKey() throw (RuntimeException) + sal_Bool SAL_CALL CMouseEvent::getShiftKey() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_shiftKey; } - sal_Bool SAL_CALL CMouseEvent::getAltKey() throw (RuntimeException) + sal_Bool SAL_CALL CMouseEvent::getAltKey() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_altKey; } - sal_Bool SAL_CALL CMouseEvent::getMetaKey() throw (RuntimeException) + sal_Bool SAL_CALL CMouseEvent::getMetaKey() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_metaKey; } - sal_Int16 SAL_CALL CMouseEvent::getButton() throw (RuntimeException) + sal_Int16 SAL_CALL CMouseEvent::getButton() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_button; } - Reference< XEventTarget > SAL_CALL CMouseEvent::getRelatedTarget() throw(RuntimeException) + Reference< XEventTarget > SAL_CALL CMouseEvent::getRelatedTarget() throw(RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_relatedTarget; @@ -102,7 +102,7 @@ namespace DOM { namespace events sal_Bool metaKeyArg, sal_Int16 buttonArg, const Reference< XEventTarget >& /*relatedTargetArg*/) - throw(RuntimeException) + throw(RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -119,12 +119,12 @@ namespace DOM { namespace events } // delegate to CUIEvent, since we are inheriting from CUIEvent and XUIEvent - Reference< XAbstractView > SAL_CALL CMouseEvent::getView() throw(RuntimeException) + Reference< XAbstractView > SAL_CALL CMouseEvent::getView() throw(RuntimeException, std::exception) { return CUIEvent::getView(); } - sal_Int32 SAL_CALL CMouseEvent::getDetail() throw(RuntimeException) + sal_Int32 SAL_CALL CMouseEvent::getDetail() throw(RuntimeException, std::exception) { return CUIEvent::getDetail(); } @@ -133,58 +133,58 @@ namespace DOM { namespace events sal_Bool canBubbleArg, sal_Bool cancelableArg, const Reference< XAbstractView >& viewArg, - sal_Int32 detailArg) throw(RuntimeException) + sal_Int32 detailArg) throw(RuntimeException, std::exception) { CUIEvent::initUIEvent(typeArg, canBubbleArg, cancelableArg, viewArg, detailArg); } - OUString SAL_CALL CMouseEvent::getType() throw (RuntimeException) + OUString SAL_CALL CMouseEvent::getType() throw (RuntimeException, std::exception) { return CUIEvent::getType(); } - Reference< XEventTarget > SAL_CALL CMouseEvent::getTarget() throw (RuntimeException) + Reference< XEventTarget > SAL_CALL CMouseEvent::getTarget() throw (RuntimeException, std::exception) { return CUIEvent::getTarget(); } - Reference< XEventTarget > SAL_CALL CMouseEvent::getCurrentTarget() throw (RuntimeException) + Reference< XEventTarget > SAL_CALL CMouseEvent::getCurrentTarget() throw (RuntimeException, std::exception) { return CUIEvent::getCurrentTarget(); } - PhaseType SAL_CALL CMouseEvent::getEventPhase() throw (RuntimeException) + PhaseType SAL_CALL CMouseEvent::getEventPhase() throw (RuntimeException, std::exception) { return CUIEvent::getEventPhase(); } - sal_Bool SAL_CALL CMouseEvent::getBubbles() throw (RuntimeException) + sal_Bool SAL_CALL CMouseEvent::getBubbles() throw (RuntimeException, std::exception) { return CEvent::getBubbles(); } - sal_Bool SAL_CALL CMouseEvent::getCancelable() throw (RuntimeException) + sal_Bool SAL_CALL CMouseEvent::getCancelable() throw (RuntimeException, std::exception) { return CUIEvent::getCancelable(); } - com::sun::star::util::Time SAL_CALL CMouseEvent::getTimeStamp() throw (RuntimeException) + com::sun::star::util::Time SAL_CALL CMouseEvent::getTimeStamp() throw (RuntimeException, std::exception) { return CUIEvent::getTimeStamp(); } - void SAL_CALL CMouseEvent::stopPropagation() throw (RuntimeException) + void SAL_CALL CMouseEvent::stopPropagation() throw (RuntimeException, std::exception) { CUIEvent::stopPropagation(); } - void SAL_CALL CMouseEvent::preventDefault() throw (RuntimeException) + void SAL_CALL CMouseEvent::preventDefault() throw (RuntimeException, std::exception) { CUIEvent::preventDefault(); } void SAL_CALL CMouseEvent::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (RuntimeException) + sal_Bool cancelableArg) throw (RuntimeException, std::exception) { // base initializer CUIEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx index 5f3d31c21b8e..460c0a8ed5e3 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 (RuntimeException); - virtual sal_Int32 SAL_CALL getScreenY() throw (RuntimeException); - virtual sal_Int32 SAL_CALL getClientX() throw (RuntimeException); - virtual sal_Int32 SAL_CALL getClientY() throw (RuntimeException); - virtual sal_Bool SAL_CALL getCtrlKey() throw (RuntimeException); - virtual sal_Bool SAL_CALL getShiftKey() throw (RuntimeException); - virtual sal_Bool SAL_CALL getAltKey() throw (RuntimeException); - virtual sal_Bool SAL_CALL getMetaKey() throw (RuntimeException); - virtual sal_Int16 SAL_CALL getButton() throw (RuntimeException); - virtual Reference< XEventTarget > SAL_CALL getRelatedTarget() throw(RuntimeException); + virtual sal_Int32 SAL_CALL getScreenX() throw (RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getScreenY() throw (RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getClientX() throw (RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getClientY() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getCtrlKey() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getShiftKey() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAltKey() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getMetaKey() throw (RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getButton() throw (RuntimeException, std::exception); + virtual Reference< XEventTarget > SAL_CALL getRelatedTarget() throw(RuntimeException, std::exception); virtual void SAL_CALL initMouseEvent( const OUString& typeArg, @@ -77,30 +77,30 @@ public: sal_Bool metaKeyArg, sal_Int16 buttonArg, const Reference< XEventTarget >& relatedTargetArg) - throw(RuntimeException); + throw(RuntimeException, std::exception); // delegate to CUIevent - virtual Reference< XAbstractView > SAL_CALL getView() throw (RuntimeException); - virtual sal_Int32 SAL_CALL getDetail() throw (RuntimeException); + virtual Reference< XAbstractView > SAL_CALL getView() throw (RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDetail() throw (RuntimeException, std::exception); virtual void SAL_CALL initUIEvent(const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg, const Reference< XAbstractView >& viewArg, - sal_Int32 detailArg) throw (RuntimeException); - virtual OUString SAL_CALL getType() throw (RuntimeException); - virtual Reference< XEventTarget > SAL_CALL getTarget() throw (RuntimeException); - virtual Reference< XEventTarget > SAL_CALL getCurrentTarget() throw (RuntimeException); - virtual PhaseType SAL_CALL getEventPhase() throw (RuntimeException); - virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException); - virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException); - virtual com::sun::star::util::Time SAL_CALL getTimeStamp() throw (RuntimeException); - virtual void SAL_CALL stopPropagation() throw (RuntimeException); - virtual void SAL_CALL preventDefault() throw (RuntimeException); + sal_Int32 detailArg) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getType() throw (RuntimeException, std::exception); + virtual Reference< XEventTarget > SAL_CALL getTarget() throw (RuntimeException, std::exception); + virtual Reference< XEventTarget > SAL_CALL getCurrentTarget() throw (RuntimeException, std::exception); + virtual PhaseType SAL_CALL getEventPhase() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException, std::exception); + virtual com::sun::star::util::Time SAL_CALL getTimeStamp() throw (RuntimeException, std::exception); + virtual void SAL_CALL stopPropagation() throw (RuntimeException, std::exception); + virtual void SAL_CALL preventDefault() throw (RuntimeException, std::exception); virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; }} #endif diff --git a/unoxml/source/events/mutationevent.cxx b/unoxml/source/events/mutationevent.cxx index f3889ea9755a..fb6da513cd1e 100644 --- a/unoxml/source/events/mutationevent.cxx +++ b/unoxml/source/events/mutationevent.cxx @@ -31,31 +31,31 @@ namespace DOM { namespace events { } - Reference< XNode > SAL_CALL CMutationEvent::getRelatedNode() throw (RuntimeException) + Reference< XNode > SAL_CALL CMutationEvent::getRelatedNode() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_relatedNode; } - OUString SAL_CALL CMutationEvent::getPrevValue() throw (RuntimeException) + OUString SAL_CALL CMutationEvent::getPrevValue() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_prevValue; } - OUString SAL_CALL CMutationEvent::getNewValue() throw (RuntimeException) + OUString SAL_CALL CMutationEvent::getNewValue() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_newValue; } - OUString SAL_CALL CMutationEvent::getAttrName() throw (RuntimeException) + OUString SAL_CALL CMutationEvent::getAttrName() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_attrName; } - AttrChangeType SAL_CALL CMutationEvent::getAttrChange() throw (RuntimeException) + AttrChangeType SAL_CALL CMutationEvent::getAttrChange() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_attrChangeType; @@ -65,7 +65,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) + AttrChangeType attrChangeArg) throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -78,52 +78,52 @@ namespace DOM { namespace events } // delegate to CEvent, since we are inheriting from CEvent and XEvent - OUString SAL_CALL CMutationEvent::getType() throw (RuntimeException) + OUString SAL_CALL CMutationEvent::getType() throw (RuntimeException, std::exception) { return CEvent::getType(); } - Reference< XEventTarget > SAL_CALL CMutationEvent::getTarget() throw (RuntimeException) + Reference< XEventTarget > SAL_CALL CMutationEvent::getTarget() throw (RuntimeException, std::exception) { return CEvent::getTarget(); } - Reference< XEventTarget > SAL_CALL CMutationEvent::getCurrentTarget() throw (RuntimeException) + Reference< XEventTarget > SAL_CALL CMutationEvent::getCurrentTarget() throw (RuntimeException, std::exception) { return CEvent::getCurrentTarget(); } - PhaseType SAL_CALL CMutationEvent::getEventPhase() throw (RuntimeException) + PhaseType SAL_CALL CMutationEvent::getEventPhase() throw (RuntimeException, std::exception) { return CEvent::getEventPhase(); } - sal_Bool SAL_CALL CMutationEvent::getBubbles() throw (RuntimeException) + sal_Bool SAL_CALL CMutationEvent::getBubbles() throw (RuntimeException, std::exception) { return CEvent::getBubbles(); } - sal_Bool SAL_CALL CMutationEvent::getCancelable() throw (RuntimeException) + sal_Bool SAL_CALL CMutationEvent::getCancelable() throw (RuntimeException, std::exception) { return CEvent::getCancelable(); } - com::sun::star::util::Time SAL_CALL CMutationEvent::getTimeStamp() throw (RuntimeException) + com::sun::star::util::Time SAL_CALL CMutationEvent::getTimeStamp() throw (RuntimeException, std::exception) { return CEvent::getTimeStamp(); } - void SAL_CALL CMutationEvent::stopPropagation() throw (RuntimeException) + void SAL_CALL CMutationEvent::stopPropagation() throw (RuntimeException, std::exception) { CEvent::stopPropagation(); } - void SAL_CALL CMutationEvent::preventDefault() throw (RuntimeException) + void SAL_CALL CMutationEvent::preventDefault() throw (RuntimeException, std::exception) { CEvent::preventDefault(); } void SAL_CALL CMutationEvent::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (RuntimeException) + sal_Bool cancelableArg) throw (RuntimeException, std::exception) { // base initializer CEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx index ce305c85b1b2..0ee03d780659 100644 --- a/unoxml/source/events/mutationevent.hxx +++ b/unoxml/source/events/mutationevent.hxx @@ -52,11 +52,11 @@ public: virtual ~CMutationEvent(); - virtual Reference< XNode > SAL_CALL getRelatedNode() throw (RuntimeException); - virtual OUString SAL_CALL getPrevValue() throw (RuntimeException); - virtual OUString SAL_CALL getNewValue() throw (RuntimeException); - virtual OUString SAL_CALL getAttrName() throw (RuntimeException); - virtual AttrChangeType SAL_CALL getAttrChange() throw (RuntimeException); + virtual Reference< XNode > SAL_CALL getRelatedNode() throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getPrevValue() throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getNewValue() throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getAttrName() throw (RuntimeException, std::exception); + virtual AttrChangeType SAL_CALL getAttrChange() throw (RuntimeException, std::exception); virtual void SAL_CALL initMutationEvent( const OUString& typeArg, sal_Bool canBubbleArg, @@ -65,23 +65,23 @@ public: const OUString& prevValueArg, const OUString& newValueArg, const OUString& attrNameArg, - AttrChangeType attrChangeArg) throw (RuntimeException); + AttrChangeType attrChangeArg) throw (RuntimeException, std::exception); // delegate to CEvent, since we are inheriting from CEvent and XEvent - virtual OUString SAL_CALL getType() throw (RuntimeException); - virtual Reference< XEventTarget > SAL_CALL getTarget() throw (RuntimeException); - virtual Reference< XEventTarget > SAL_CALL getCurrentTarget() throw (RuntimeException); - virtual PhaseType SAL_CALL getEventPhase() throw (RuntimeException); - virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException); - virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException); - virtual com::sun::star::util::Time SAL_CALL getTimeStamp() throw (RuntimeException); - virtual void SAL_CALL stopPropagation() throw (RuntimeException); - virtual void SAL_CALL preventDefault() throw (RuntimeException); + virtual OUString SAL_CALL getType() throw (RuntimeException, std::exception); + virtual Reference< XEventTarget > SAL_CALL getTarget() throw (RuntimeException, std::exception); + virtual Reference< XEventTarget > SAL_CALL getCurrentTarget() throw (RuntimeException, std::exception); + virtual PhaseType SAL_CALL getEventPhase() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException, std::exception); + virtual com::sun::star::util::Time SAL_CALL getTimeStamp() throw (RuntimeException, std::exception); + virtual void SAL_CALL stopPropagation() throw (RuntimeException, std::exception); + virtual void SAL_CALL preventDefault() throw (RuntimeException, std::exception); virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; }} #endif diff --git a/unoxml/source/events/testlistener.cxx b/unoxml/source/events/testlistener.cxx index 9c9dad01a75a..775fab492310 100644 --- a/unoxml/source/events/testlistener.cxx +++ b/unoxml/source/events/testlistener.cxx @@ -61,26 +61,26 @@ namespace DOM { namespace events } Sequence< OUString > SAL_CALL CTestListener::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CTestListener::_getSupportedServiceNames(); } OUString SAL_CALL CTestListener::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CTestListener::_getImplementationName(); } sal_Bool SAL_CALL CTestListener::supportsService(const OUString& aServiceName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, aServiceName); } // --- XInitialize - void SAL_CALL CTestListener::initialize(const Sequence< Any >& args) throw(RuntimeException) + void SAL_CALL CTestListener::initialize(const Sequence< Any >& args) throw(RuntimeException, std::exception) { if (args.getLength() < 3) throw IllegalArgumentException( "Wrong number of arguments", Reference< XInterface >(), 0); @@ -117,7 +117,7 @@ namespace DOM { namespace events // --- XEventListener - void SAL_CALL CTestListener::handleEvent(const Reference< XEvent >& evt) throw (RuntimeException) + void SAL_CALL CTestListener::handleEvent(const Reference< XEvent >& evt) throw (RuntimeException, std::exception) { FILE* f = fopen("C:\\listener.out", "a"); fprintf(f, "CTestListener::handleEvent in %s\n", U2S(m_name)); diff --git a/unoxml/source/events/testlistener.hxx b/unoxml/source/events/testlistener.hxx index d2ebba67bb86..3fdaba6eec9b 100644 --- a/unoxml/source/events/testlistener.hxx +++ b/unoxml/source/events/testlistener.hxx @@ -81,17 +81,17 @@ namespace DOM { namespace events // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames () - throw (RuntimeException); + throw (RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL initialize(const Sequence< Any >& args) throw (RuntimeException); + virtual void SAL_CALL initialize(const Sequence< Any >& args) throw (RuntimeException, std::exception); - virtual void SAL_CALL handleEvent(const Reference< XEvent >& evt) throw (RuntimeException); + virtual void SAL_CALL handleEvent(const Reference< XEvent >& evt) throw (RuntimeException, std::exception); }; diff --git a/unoxml/source/events/uievent.cxx b/unoxml/source/events/uievent.cxx index a2ce80a658f6..31562be5cccc 100644 --- a/unoxml/source/events/uievent.cxx +++ b/unoxml/source/events/uievent.cxx @@ -28,13 +28,13 @@ namespace DOM { namespace events } Reference< XAbstractView > SAL_CALL - CUIEvent::getView() throw(RuntimeException) + CUIEvent::getView() throw(RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_view; } - sal_Int32 SAL_CALL CUIEvent::getDetail() throw(RuntimeException) + sal_Int32 SAL_CALL CUIEvent::getDetail() throw(RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); return m_detail; @@ -44,7 +44,7 @@ namespace DOM { namespace events sal_Bool canBubbleArg, sal_Bool cancelableArg, const Reference< XAbstractView >& viewArg, - sal_Int32 detailArg) throw(RuntimeException) + sal_Int32 detailArg) throw(RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -55,53 +55,53 @@ namespace DOM { namespace events // delegate to CEvent, since we are inheriting from CEvent and XEvent - OUString SAL_CALL CUIEvent::getType() throw (RuntimeException) + OUString SAL_CALL CUIEvent::getType() throw (RuntimeException, std::exception) { return CEvent::getType(); } - Reference< XEventTarget > SAL_CALL CUIEvent::getTarget() throw (RuntimeException) + Reference< XEventTarget > SAL_CALL CUIEvent::getTarget() throw (RuntimeException, std::exception) { return CEvent::getTarget(); } - Reference< XEventTarget > SAL_CALL CUIEvent::getCurrentTarget() throw (RuntimeException) + Reference< XEventTarget > SAL_CALL CUIEvent::getCurrentTarget() throw (RuntimeException, std::exception) { return CEvent::getCurrentTarget(); } - PhaseType SAL_CALL CUIEvent::getEventPhase() throw (RuntimeException) + PhaseType SAL_CALL CUIEvent::getEventPhase() throw (RuntimeException, std::exception) { return CEvent::getEventPhase(); } - sal_Bool SAL_CALL CUIEvent::getBubbles() throw (RuntimeException) + sal_Bool SAL_CALL CUIEvent::getBubbles() throw (RuntimeException, std::exception) { return CEvent::getBubbles(); } - sal_Bool SAL_CALL CUIEvent::getCancelable() throw (RuntimeException) + sal_Bool SAL_CALL CUIEvent::getCancelable() throw (RuntimeException, std::exception) { // mutation events cannot be canceled return sal_False; } - com::sun::star::util::Time SAL_CALL CUIEvent::getTimeStamp() throw (RuntimeException) + com::sun::star::util::Time SAL_CALL CUIEvent::getTimeStamp() throw (RuntimeException, std::exception) { return CEvent::getTimeStamp(); } - void SAL_CALL CUIEvent::stopPropagation() throw (RuntimeException) + void SAL_CALL CUIEvent::stopPropagation() throw (RuntimeException, std::exception) { CEvent::stopPropagation(); } - void SAL_CALL CUIEvent::preventDefault() throw (RuntimeException) + void SAL_CALL CUIEvent::preventDefault() throw (RuntimeException, std::exception) { CEvent::preventDefault(); } void SAL_CALL CUIEvent::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (RuntimeException) + sal_Bool cancelableArg) throw (RuntimeException, std::exception) { // base initializer CEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); diff --git a/unoxml/source/events/uievent.hxx b/unoxml/source/events/uievent.hxx index 13e9785b7ff1..934ff4ce3e38 100644 --- a/unoxml/source/events/uievent.hxx +++ b/unoxml/source/events/uievent.hxx @@ -47,29 +47,29 @@ protected: public: explicit CUIEvent(); - virtual Reference< XAbstractView > SAL_CALL getView() throw(RuntimeException); - virtual sal_Int32 SAL_CALL getDetail() throw(RuntimeException); + virtual Reference< XAbstractView > SAL_CALL getView() throw(RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDetail() throw(RuntimeException, std::exception); virtual void SAL_CALL initUIEvent(const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg, const Reference< XAbstractView >& viewArg, - sal_Int32 detailArg) throw(RuntimeException); + sal_Int32 detailArg) throw(RuntimeException, std::exception); // delegate to CEvent, since we are inheriting from CEvent and XEvent - virtual OUString SAL_CALL getType() throw (RuntimeException); - virtual Reference< XEventTarget > SAL_CALL getTarget() throw (RuntimeException); - virtual Reference< XEventTarget > SAL_CALL getCurrentTarget() throw (RuntimeException); - virtual PhaseType SAL_CALL getEventPhase() throw (RuntimeException); - virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException); - virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException); - virtual com::sun::star::util::Time SAL_CALL getTimeStamp() throw (RuntimeException); - virtual void SAL_CALL stopPropagation() throw (RuntimeException); - virtual void SAL_CALL preventDefault() throw (RuntimeException); + virtual OUString SAL_CALL getType() throw (RuntimeException, std::exception); + virtual Reference< XEventTarget > SAL_CALL getTarget() throw (RuntimeException, std::exception); + virtual Reference< XEventTarget > SAL_CALL getCurrentTarget() throw (RuntimeException, std::exception); + virtual PhaseType SAL_CALL getEventPhase() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException, std::exception); + virtual com::sun::star::util::Time SAL_CALL getTimeStamp() throw (RuntimeException, std::exception); + virtual void SAL_CALL stopPropagation() throw (RuntimeException, std::exception); + virtual void SAL_CALL preventDefault() throw (RuntimeException, std::exception); virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; }} #endif diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index 8b469299765c..defd8c5a79d8 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -42,15 +42,15 @@ public: virtual ~CBlankNode() {} // ::com::sun::star::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception); + virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception); // ::com::sun::star::rdf::XNode: - virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception); private: CBlankNode(const CBlankNode &); // not defined @@ -66,23 +66,23 @@ CBlankNode::CBlankNode(css::uno::Reference< css::uno::XComponentContext > const {} // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL CBlankNode::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL CBlankNode::getImplementationName() throw (css::uno::RuntimeException, std::exception) { return comp_CBlankNode::_getImplementationName(); } -::sal_Bool SAL_CALL CBlankNode::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL CBlankNode::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } -css::uno::Sequence< OUString > SAL_CALL CBlankNode::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL CBlankNode::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { return comp_CBlankNode::_getSupportedServiceNames(); } // ::com::sun::star::lang::XInitialization: -void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception) +void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) { if (aArguments.getLength() != 1) { throw css::lang::IllegalArgumentException( @@ -108,7 +108,7 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star: } // ::com::sun::star::rdf::XNode: -OUString SAL_CALL CBlankNode::getStringValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CBlankNode::getStringValue() throw (css::uno::RuntimeException, std::exception) { return m_NodeID; } diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index e19d4cfaab42..1768536fff22 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -44,20 +44,20 @@ public: virtual ~CLiteral() {} // ::com::sun::star::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception); + virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception); // ::com::sun::star::rdf::XNode: - virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception); // ::com::sun::star::rdf::XLiteral: - virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException, std::exception); private: CLiteral(const CLiteral &); // not defined @@ -75,23 +75,23 @@ CLiteral::CLiteral(css::uno::Reference< css::uno::XComponentContext > const & co {} // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL CLiteral::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getImplementationName() throw (css::uno::RuntimeException, std::exception) { return comp_CLiteral::_getImplementationName(); } -::sal_Bool SAL_CALL CLiteral::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL CLiteral::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } -css::uno::Sequence< OUString > SAL_CALL CLiteral::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL CLiteral::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { return comp_CLiteral::_getSupportedServiceNames(); } // ::com::sun::star::lang::XInitialization: -void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception) +void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) { const sal_Int32 len( aArguments.getLength() ); if (len < 1 || len > 2) { @@ -143,7 +143,7 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u } // ::com::sun::star::rdf::XNode: -OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException, std::exception) { if (!m_Language.isEmpty()) { OUStringBuffer buf(m_Value); @@ -161,17 +161,17 @@ OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException) } // ::com::sun::star::rdf::XLiteral: -OUString SAL_CALL CLiteral::getValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getValue() throw (css::uno::RuntimeException, std::exception) { return m_Value; } -OUString SAL_CALL CLiteral::getLanguage() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getLanguage() throw (css::uno::RuntimeException, std::exception) { return m_Language; } -css::uno::Reference< css::rdf::XURI > SAL_CALL CLiteral::getDatatype() throw (css::uno::RuntimeException) +css::uno::Reference< css::rdf::XURI > SAL_CALL CLiteral::getDatatype() throw (css::uno::RuntimeException, std::exception) { return m_xDatatype; } diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index 474135e77d47..808d8d465df8 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -43,19 +43,19 @@ public: virtual ~CURI() {} // ::com::sun::star::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception); + virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception); // ::com::sun::star::rdf::XNode: - virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception); // ::com::sun::star::rdf::XURI: - virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException, std::exception); private: CURI(const CURI &); // not defined @@ -75,17 +75,17 @@ CURI::CURI(css::uno::Reference< css::uno::XComponentContext > const & context) : {} // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL CURI::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getImplementationName() throw (css::uno::RuntimeException, std::exception) { return comp_CURI::_getImplementationName(); } -::sal_Bool SAL_CALL CURI::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL CURI::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } -css::uno::Sequence< OUString > SAL_CALL CURI::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL CURI::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { return comp_CURI::_getSupportedServiceNames(); } @@ -712,7 +712,7 @@ void SAL_CALL CURI::initFromConstant(const sal_Int16 i_Constant) } // ::com::sun::star::lang::XInitialization: -void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception) +void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) { sal_Int32 len = aArguments.getLength(); if ((len < 1) || (len > 2)) { @@ -786,18 +786,18 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: } // ::com::sun::star::rdf::XNode: -OUString SAL_CALL CURI::getStringValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getStringValue() throw (css::uno::RuntimeException, std::exception) { return m_Namespace + m_LocalName; } // ::com::sun::star::rdf::XURI: -OUString SAL_CALL CURI::getNamespace() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getNamespace() throw (css::uno::RuntimeException, std::exception) { return m_Namespace; } -OUString SAL_CALL CURI::getLocalName() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getLocalName() throw (css::uno::RuntimeException, std::exception) { return m_LocalName; } diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index acaefb58990c..7af8adbcd392 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -286,15 +286,15 @@ public: // ::com::sun::star::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL supportsService( - const OUString & ServiceName) throw (uno::RuntimeException); + const OUString & ServiceName) throw (uno::RuntimeException, std::exception); virtual uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (uno::RuntimeException); + getSupportedServiceNames() throw (uno::RuntimeException, std::exception); // ::com::sun::star::rdf::XRepository: virtual uno::Reference< rdf::XBlankNode > SAL_CALL createBlankNode() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual uno::Reference<rdf::XNamedGraph> SAL_CALL importGraph( ::sal_Int16 i_Format, const uno::Reference< io::XInputStream > & i_xInStream, @@ -303,7 +303,7 @@ public: throw (uno::RuntimeException, lang::IllegalArgumentException, datatransfer::UnsupportedFlavorException, container::ElementExistException, rdf::ParseException, - rdf::RepositoryException, io::IOException); + rdf::RepositoryException, io::IOException, std::exception); virtual void SAL_CALL exportGraph(::sal_Int16 i_Format, const uno::Reference< io::XOutputStream > & i_xOutStream, const uno::Reference< rdf::XURI > & i_xGraphName, @@ -311,38 +311,38 @@ public: throw (uno::RuntimeException, lang::IllegalArgumentException, datatransfer::UnsupportedFlavorException, container::NoSuchElementException, rdf::RepositoryException, - io::IOException); + io::IOException, std::exception); virtual uno::Sequence< uno::Reference< rdf::XURI > > SAL_CALL - getGraphNames() throw (uno::RuntimeException, rdf::RepositoryException); + getGraphNames() throw (uno::RuntimeException, rdf::RepositoryException, std::exception); virtual uno::Reference< rdf::XNamedGraph > SAL_CALL getGraph( const uno::Reference< rdf::XURI > & i_xGraphName) throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException); + rdf::RepositoryException, std::exception); virtual uno::Reference< rdf::XNamedGraph > SAL_CALL createGraph( const uno::Reference< rdf::XURI > & i_xGraphName) throw (uno::RuntimeException, lang::IllegalArgumentException, - container::ElementExistException, rdf::RepositoryException); + container::ElementExistException, rdf::RepositoryException, std::exception); virtual void SAL_CALL destroyGraph( const uno::Reference< rdf::XURI > & i_xGraphName) throw (uno::RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException, rdf::RepositoryException); + container::NoSuchElementException, rdf::RepositoryException, std::exception); 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); + rdf::RepositoryException, std::exception); virtual uno::Reference< rdf::XQuerySelectResult > SAL_CALL querySelect(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, - rdf::RepositoryException); + rdf::RepositoryException, std::exception); virtual uno::Reference< container::XEnumeration > SAL_CALL queryConstruct(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, - rdf::RepositoryException); + rdf::RepositoryException, std::exception); virtual ::sal_Bool SAL_CALL queryAsk(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, - rdf::RepositoryException); + rdf::RepositoryException, std::exception); // ::com::sun::star::rdf::XDocumentRepository: virtual void SAL_CALL setStatementRDFa( @@ -352,27 +352,27 @@ public: const OUString & i_rRDFaContent, const uno::Reference< rdf::XURI > & i_xRDFaDatatype) throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException); + rdf::RepositoryException, std::exception); virtual void SAL_CALL removeStatementRDFa( const uno::Reference< rdf::XMetadatable > & i_xElement) throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException); + rdf::RepositoryException, std::exception); 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); + rdf::RepositoryException, std::exception); 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); + rdf::RepositoryException, std::exception); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize( const uno::Sequence< ::com::sun::star::uno::Any > & i_rArguments) - throw (uno::RuntimeException, uno::Exception); + throw (uno::RuntimeException, uno::Exception, std::exception); // XNamedGraph forwards --------------------------------------------- const NamedGraphMap_t::iterator clearGraph_NoLock( @@ -485,10 +485,10 @@ public: // ::com::sun::star::container::XEnumeration: virtual ::sal_Bool SAL_CALL hasMoreElements() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual uno::Any SAL_CALL nextElement() throw (uno::RuntimeException, container::NoSuchElementException, - lang::WrappedTargetException); + lang::WrappedTargetException, std::exception); private: // NB: this is not a weak pointer: streams _must_ be deleted before the @@ -510,7 +510,7 @@ private: // ::com::sun::star::container::XEnumeration: ::sal_Bool SAL_CALL -librdf_GraphResult::hasMoreElements() throw (uno::RuntimeException) +librdf_GraphResult::hasMoreElements() throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_rMutex); return m_pStream.get() && !librdf_stream_end(m_pStream.get()); @@ -534,7 +534,7 @@ librdf_node* librdf_GraphResult::getContext_Lock() const ::com::sun::star::uno::Any SAL_CALL librdf_GraphResult::nextElement() throw (uno::RuntimeException, container::NoSuchElementException, - lang::WrappedTargetException) + lang::WrappedTargetException, std::exception) { ::osl::MutexGuard g(m_rMutex); if (!m_pStream.get() || !librdf_stream_end(m_pStream.get())) { @@ -598,14 +598,14 @@ public: // ::com::sun::star::container::XEnumeration: virtual ::sal_Bool SAL_CALL hasMoreElements() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual uno::Any SAL_CALL nextElement() throw (uno::RuntimeException, container::NoSuchElementException, - lang::WrappedTargetException); + lang::WrappedTargetException, std::exception); // ::com::sun::star::rdf::XQuerySelectResult: virtual uno::Sequence< OUString > SAL_CALL getBindingNames() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); private: @@ -625,7 +625,7 @@ private: // ::com::sun::star::container::XEnumeration: ::sal_Bool SAL_CALL -librdf_QuerySelectResult::hasMoreElements() throw (uno::RuntimeException) +librdf_QuerySelectResult::hasMoreElements() throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_rMutex); return !librdf_query_results_finished(m_pQueryResult.get()); @@ -648,7 +648,7 @@ public: ::com::sun::star::uno::Any SAL_CALL librdf_QuerySelectResult::nextElement() throw (uno::RuntimeException, container::NoSuchElementException, - lang::WrappedTargetException) + lang::WrappedTargetException, std::exception) { ::osl::MutexGuard g(m_rMutex); if (!librdf_query_results_finished(m_pQueryResult.get())) { @@ -684,7 +684,7 @@ throw (uno::RuntimeException, container::NoSuchElementException, // ::com::sun::star::rdf::XQuerySelectResult: uno::Sequence< OUString > SAL_CALL -librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException) +librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException, std::exception) { // const - no lock needed return m_BindingNames; @@ -712,38 +712,38 @@ public: // ::com::sun::star::rdf::XNode: virtual OUString SAL_CALL getStringValue() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); // ::com::sun::star::rdf::XURI: virtual OUString SAL_CALL getNamespace() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual OUString SAL_CALL getLocalName() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); // ::com::sun::star::rdf::XNamedGraph: virtual uno::Reference<rdf::XURI> SAL_CALL getName() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual void SAL_CALL clear() throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException); + container::NoSuchElementException, rdf::RepositoryException, std::exception); 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); + container::NoSuchElementException, rdf::RepositoryException, std::exception); 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); + container::NoSuchElementException, rdf::RepositoryException, std::exception); 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); + container::NoSuchElementException, rdf::RepositoryException, std::exception); private: @@ -756,34 +756,34 @@ private: // ::com::sun::star::rdf::XNode: OUString SAL_CALL librdf_NamedGraph::getStringValue() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { return m_xName->getStringValue(); } // ::com::sun::star::rdf::XURI: OUString SAL_CALL librdf_NamedGraph::getNamespace() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { return m_xName->getNamespace(); } OUString SAL_CALL librdf_NamedGraph::getLocalName() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { return m_xName->getLocalName(); } // ::com::sun::star::rdf::XNamedGraph: uno::Reference< rdf::XURI > SAL_CALL librdf_NamedGraph::getName() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { return m_xName; } void SAL_CALL librdf_NamedGraph::clear() throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException) + container::NoSuchElementException, rdf::RepositoryException, std::exception) { uno::Reference< rdf::XRepository > xRep( m_wRep ); if (!xRep.is()) { @@ -803,7 +803,7 @@ void SAL_CALL librdf_NamedGraph::addStatement( const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) throw (uno::RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException, rdf::RepositoryException) + container::NoSuchElementException, rdf::RepositoryException, std::exception) { uno::Reference< rdf::XRepository > xRep( m_wRep ); if (!xRep.is()) { @@ -819,7 +819,7 @@ void SAL_CALL librdf_NamedGraph::removeStatements( const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException) + container::NoSuchElementException, rdf::RepositoryException, std::exception) { uno::Reference< rdf::XRepository > xRep( m_wRep ); if (!xRep.is()) { @@ -836,7 +836,7 @@ librdf_NamedGraph::getStatements( const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException) + container::NoSuchElementException, rdf::RepositoryException, std::exception) { uno::Reference< rdf::XRepository > xRep( m_wRep ); if (!xRep.is()) { @@ -892,26 +892,26 @@ librdf_Repository::~librdf_Repository() // com.sun.star.uno.XServiceInfo: OUString SAL_CALL librdf_Repository::getImplementationName() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { return comp_librdf_Repository::_getImplementationName(); } ::sal_Bool SAL_CALL librdf_Repository::supportsService( - OUString const & serviceName) throw (uno::RuntimeException) + OUString const & serviceName) throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } uno::Sequence< OUString > SAL_CALL -librdf_Repository::getSupportedServiceNames() throw (uno::RuntimeException) +librdf_Repository::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { return comp_librdf_Repository::_getSupportedServiceNames(); } // ::com::sun::star::rdf::XRepository: uno::Reference< rdf::XBlankNode > SAL_CALL librdf_Repository::createBlankNode() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); const boost::shared_ptr<librdf_node> pNode( @@ -954,7 +954,7 @@ librdf_Repository::importGraph(::sal_Int16 i_Format, throw (uno::RuntimeException, lang::IllegalArgumentException, datatransfer::UnsupportedFlavorException, container::ElementExistException, rdf::ParseException, - rdf::RepositoryException, io::IOException) + rdf::RepositoryException, io::IOException, std::exception) { if (!i_xInStream.is()) { throw lang::IllegalArgumentException( @@ -1109,7 +1109,7 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format, throw (uno::RuntimeException, lang::IllegalArgumentException, datatransfer::UnsupportedFlavorException, container::NoSuchElementException, rdf::RepositoryException, - io::IOException) + io::IOException, std::exception) { if (!i_xOutStream.is()) { throw lang::IllegalArgumentException( @@ -1249,7 +1249,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, uno::Sequence< uno::Reference< rdf::XURI > > SAL_CALL librdf_Repository::getGraphNames() -throw (uno::RuntimeException, rdf::RepositoryException) +throw (uno::RuntimeException, rdf::RepositoryException, std::exception) { ::osl::MutexGuard g(m_aMutex); ::comphelper::SequenceAsVector< uno::Reference<rdf::XURI> > ret; @@ -1263,7 +1263,7 @@ throw (uno::RuntimeException, rdf::RepositoryException) uno::Reference< rdf::XNamedGraph > SAL_CALL librdf_Repository::getGraph(const uno::Reference< rdf::XURI > & i_xGraphName) throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException) + rdf::RepositoryException, std::exception) { if (!i_xGraphName.is()) { throw lang::IllegalArgumentException( @@ -1283,7 +1283,7 @@ 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) + container::ElementExistException, rdf::RepositoryException, std::exception) { if (!i_xGraphName.is()) { throw lang::IllegalArgumentException( @@ -1317,7 +1317,7 @@ void SAL_CALL librdf_Repository::destroyGraph( const uno::Reference< rdf::XURI > & i_xGraphName) throw (uno::RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException, rdf::RepositoryException) + container::NoSuchElementException, rdf::RepositoryException, std::exception) { if (!i_xGraphName.is()) { throw lang::IllegalArgumentException( @@ -1343,7 +1343,7 @@ 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) +throw (uno::RuntimeException, rdf::RepositoryException, std::exception) { if (isMetadatableWithoutMetadata(i_xSubject) || isMetadatableWithoutMetadata(i_xPredicate) || @@ -1381,7 +1381,7 @@ throw (uno::RuntimeException, rdf::RepositoryException) uno::Reference< rdf::XQuerySelectResult > SAL_CALL librdf_Repository::querySelect(const OUString & i_rQuery) -throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) +throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std::exception) { ::osl::MutexGuard g(m_aMutex); const OString query( @@ -1430,7 +1430,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) uno::Reference< container::XEnumeration > SAL_CALL librdf_Repository::queryConstruct(const OUString & i_rQuery) -throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) +throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std::exception) { ::osl::MutexGuard g(m_aMutex); const OString query( @@ -1467,7 +1467,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) ::sal_Bool SAL_CALL librdf_Repository::queryAsk(const OUString & i_rQuery) -throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) +throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std::exception) { ::osl::MutexGuard g(m_aMutex); @@ -1502,7 +1502,7 @@ void SAL_CALL librdf_Repository::setStatementRDFa( const OUString & i_rRDFaContent, const uno::Reference< rdf::XURI > & i_xRDFaDatatype) throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException) + rdf::RepositoryException, std::exception) { static const OUString s_cell("com.sun.star.table.Cell"); static const OUString s_cellprops("com.sun.star.text.CellProperties"); // for writer @@ -1615,7 +1615,7 @@ 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) + rdf::RepositoryException, std::exception) { if (!i_xElement.is()) { throw lang::IllegalArgumentException( @@ -1638,7 +1638,7 @@ 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) + rdf::RepositoryException, std::exception) { if (!i_xElement.is()) { throw lang::IllegalArgumentException( @@ -1705,7 +1705,7 @@ 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) +throw (uno::RuntimeException, rdf::RepositoryException, std::exception) { if (isMetadatableWithoutMetadata(i_xSubject) || isMetadatableWithoutMetadata(i_xPredicate) || @@ -1750,7 +1750,7 @@ throw (uno::RuntimeException, rdf::RepositoryException) // ::com::sun::star::lang::XInitialization: void SAL_CALL librdf_Repository::initialize( const uno::Sequence< ::com::sun::star::uno::Any > & i_rArguments) -throw (uno::RuntimeException, uno::Exception) +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 dbe225bcbc95..7b3fb19b2eb3 100644 --- a/unoxml/source/xpath/nodelist.cxx +++ b/unoxml/source/xpath/nodelist.cxx @@ -41,7 +41,7 @@ namespace XPath /** The number of nodes in the list. */ - sal_Int32 SAL_CALL CNodeList::getLength() throw (RuntimeException) + sal_Int32 SAL_CALL CNodeList::getLength() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -55,7 +55,7 @@ namespace XPath Returns the indexth item in the collection. */ Reference< XNode > SAL_CALL CNodeList::item(sal_Int32 index) - throw (RuntimeException) + 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 91312de21650..a9923a10421a 100644 --- a/unoxml/source/xpath/nodelist.hxx +++ b/unoxml/source/xpath/nodelist.hxx @@ -64,12 +64,12 @@ namespace XPath /** The number of nodes in the list. */ - virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException); + virtual sal_Int32 SAL_CALL getLength() throw (RuntimeException, std::exception); /** Returns the indexth item in the collection. */ virtual Reference< XNode > SAL_CALL item(sal_Int32 index) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; } diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index 65c58c0c6df3..9c2879397aec 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -76,19 +76,19 @@ namespace XPath } Sequence< OUString > SAL_CALL CXPathAPI::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CXPathAPI::_getSupportedServiceNames(); } OUString SAL_CALL CXPathAPI::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CXPathAPI::_getImplementationName(); } sal_Bool SAL_CALL CXPathAPI::supportsService(const OUString& aServiceName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, aServiceName); } @@ -96,7 +96,7 @@ namespace XPath void SAL_CALL CXPathAPI::registerNS( const OUString& aPrefix, const OUString& aURI) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -106,7 +106,7 @@ namespace XPath void SAL_CALL CXPathAPI::unregisterNS( const OUString& aPrefix, const OUString& aURI) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -211,7 +211,7 @@ namespace XPath Reference< XNodeList > SAL_CALL CXPathAPI::selectNodeList( const Reference< XNode >& contextNode, const OUString& expr) - throw (RuntimeException, XPathException) + throw (RuntimeException, XPathException, std::exception) { Reference< XXPathObject > xobj = eval(contextNode, expr); return xobj->getNodeList(); @@ -224,7 +224,7 @@ namespace XPath const Reference< XNode >& contextNode, const OUString& expr, const Reference< XNode >& namespaceNode) - throw (RuntimeException, XPathException) + throw (RuntimeException, XPathException, std::exception) { lcl_collectRegisterNamespaces(*this, namespaceNode); return selectNodeList(contextNode, expr); @@ -236,7 +236,7 @@ namespace XPath Reference< XNode > SAL_CALL CXPathAPI::selectSingleNode( const Reference< XNode >& contextNode, const OUString& expr) - throw (RuntimeException, XPathException) + throw (RuntimeException, XPathException, std::exception) { Reference< XNodeList > aList = selectNodeList(contextNode, expr); Reference< XNode > aNode = aList->item(0); @@ -251,7 +251,7 @@ namespace XPath const Reference< XNode >& contextNode, const OUString& expr, const Reference< XNode >& namespaceNode ) - throw (RuntimeException, XPathException) + throw (RuntimeException, XPathException, std::exception) { lcl_collectRegisterNamespaces(*this, namespaceNode); return selectSingleNode(contextNode, expr); @@ -314,7 +314,7 @@ namespace XPath Reference< XXPathObject > SAL_CALL CXPathAPI::eval( Reference< XNode > const& xContextNode, const OUString& expr) - throw (RuntimeException, XPathException) + throw (RuntimeException, XPathException, std::exception) { if (!xContextNode.is()) { throw RuntimeException(); } @@ -390,7 +390,7 @@ namespace XPath const Reference< XNode >& contextNode, const OUString& expr, const Reference< XNode >& namespaceNode) - throw (RuntimeException, XPathException) + throw (RuntimeException, XPathException, std::exception) { lcl_collectRegisterNamespaces(*this, namespaceNode); return eval(contextNode, expr); @@ -403,7 +403,7 @@ namespace XPath */ void SAL_CALL CXPathAPI::registerExtension( const OUString& aName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_Mutex); @@ -419,7 +419,7 @@ namespace XPath */ void SAL_CALL CXPathAPI::registerExtensionInstance( Reference< XXPathExtension> const& xExtension) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (!xExtension.is()) { throw RuntimeException(); diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx index afa24d822dbe..7e69568d402a 100644 --- a/unoxml/source/xpath/xpathapi.hxx +++ b/unoxml/source/xpath/xpathapi.hxx @@ -89,53 +89,53 @@ namespace XPath // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames () - throw (RuntimeException); + throw (RuntimeException, std::exception); // --- XXPathAPI --- virtual void SAL_CALL registerNS(const OUString& aPrefix, const OUString& aURI) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL unregisterNS(const OUString& aPrefix, const OUString& aURI) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** Use an XPath string to select a nodelist. */ virtual Reference< XNodeList > SAL_CALL selectNodeList(const Reference< XNode >& contextNode, const OUString& str) - throw (RuntimeException, XPathException); + throw (RuntimeException, XPathException, std::exception); /** Use an XPath string to select a nodelist. */ virtual Reference< XNodeList > SAL_CALL selectNodeListNS(const Reference< XNode >& contextNode, const OUString& str, const Reference< XNode >& namespaceNode) - throw (RuntimeException, XPathException); + throw (RuntimeException, XPathException, std::exception); /** Use an XPath string to select a single node. */ virtual Reference< XNode > SAL_CALL selectSingleNode(const Reference< XNode >& contextNode, const OUString& str) - throw (RuntimeException, XPathException); + throw (RuntimeException, XPathException, std::exception); /** Use an XPath string to select a single node. */ virtual Reference< XNode > SAL_CALL selectSingleNodeNS(const Reference< XNode >& contextNode, const OUString& str, const Reference< XNode >& namespaceNode) - throw (RuntimeException, XPathException); + throw (RuntimeException, XPathException, std::exception); virtual Reference< XXPathObject > SAL_CALL eval(const Reference< XNode >& contextNode, const OUString& str) - throw (RuntimeException, XPathException); + throw (RuntimeException, XPathException, std::exception); virtual Reference< XXPathObject > SAL_CALL evalNS(const Reference< XNode >& contextNode, const OUString& str, const Reference< XNode >& namespaceNode) - throw (RuntimeException, XPathException); + throw (RuntimeException, XPathException, std::exception); - virtual void SAL_CALL registerExtension(const OUString& aName) throw (RuntimeException); - virtual void SAL_CALL registerExtensionInstance(const Reference< XXPathExtension>& aExtension) throw (RuntimeException); + virtual void SAL_CALL registerExtension(const OUString& aName) throw (RuntimeException, std::exception); + virtual void SAL_CALL registerExtensionInstance(const Reference< XXPathExtension>& aExtension) throw (RuntimeException, std::exception); }; } diff --git a/unoxml/source/xpath/xpathobject.cxx b/unoxml/source/xpath/xpathobject.cxx index a1a7797095c2..0272c826b97d 100644 --- a/unoxml/source/xpath/xpathobject.cxx +++ b/unoxml/source/xpath/xpathobject.cxx @@ -70,7 +70,7 @@ namespace XPath /** get object type */ - XPathObjectType CXPathObject::getObjectType() throw (RuntimeException) + XPathObjectType CXPathObject::getObjectType() throw (RuntimeException, std::exception) { return m_XPathObjectType; } @@ -79,7 +79,7 @@ namespace XPath get the nodes from a nodelist type object */ Reference< XNodeList > SAL_CALL - CXPathObject::getNodeList() throw (RuntimeException) + CXPathObject::getNodeList() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -91,7 +91,7 @@ namespace XPath /** get value of a boolean object */ - sal_Bool SAL_CALL CXPathObject::getBoolean() throw (RuntimeException) + sal_Bool SAL_CALL CXPathObject::getBoolean() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -101,7 +101,7 @@ namespace XPath /** get number as byte */ - sal_Int8 SAL_CALL CXPathObject::getByte() throw (RuntimeException) + sal_Int8 SAL_CALL CXPathObject::getByte() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -111,7 +111,7 @@ namespace XPath /** get number as short */ - sal_Int16 SAL_CALL CXPathObject::getShort() throw (RuntimeException) + sal_Int16 SAL_CALL CXPathObject::getShort() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -121,7 +121,7 @@ namespace XPath /** get number as long */ - sal_Int32 SAL_CALL CXPathObject::getLong() throw (RuntimeException) + sal_Int32 SAL_CALL CXPathObject::getLong() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -131,7 +131,7 @@ namespace XPath /** get number as hyper */ - sal_Int64 SAL_CALL CXPathObject::getHyper() throw (RuntimeException) + sal_Int64 SAL_CALL CXPathObject::getHyper() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -141,7 +141,7 @@ namespace XPath /** get number as float */ - float SAL_CALL CXPathObject::getFloat() throw (RuntimeException) + float SAL_CALL CXPathObject::getFloat() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -151,7 +151,7 @@ namespace XPath /** get number as double */ - double SAL_CALL CXPathObject::getDouble() throw (RuntimeException) + double SAL_CALL CXPathObject::getDouble() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); @@ -161,7 +161,7 @@ namespace XPath /** get string value */ - OUString SAL_CALL CXPathObject::getString() throw (RuntimeException) + OUString SAL_CALL CXPathObject::getString() throw (RuntimeException, std::exception) { ::osl::MutexGuard const g(m_rMutex); diff --git a/unoxml/source/xpath/xpathobject.hxx b/unoxml/source/xpath/xpathobject.hxx index f576d852064c..ea9d78a7bc78 100644 --- a/unoxml/source/xpath/xpathobject.hxx +++ b/unoxml/source/xpath/xpathobject.hxx @@ -61,53 +61,53 @@ namespace XPath /** get object type */ - virtual XPathObjectType SAL_CALL getObjectType() throw (RuntimeException); + virtual XPathObjectType SAL_CALL getObjectType() throw (RuntimeException, std::exception); /** get the nodes from a nodelist type object */ virtual Reference< XNodeList > SAL_CALL getNodeList() - throw (RuntimeException); + throw (RuntimeException, std::exception); /** get value of a boolean object */ - virtual sal_Bool SAL_CALL getBoolean() throw (RuntimeException); + virtual sal_Bool SAL_CALL getBoolean() throw (RuntimeException, std::exception); /** get number as byte */ - virtual sal_Int8 SAL_CALL getByte() throw (RuntimeException); + virtual sal_Int8 SAL_CALL getByte() throw (RuntimeException, std::exception); /** get number as short */ - virtual sal_Int16 SAL_CALL getShort() throw (RuntimeException); + virtual sal_Int16 SAL_CALL getShort() throw (RuntimeException, std::exception); /** get number as long */ - virtual sal_Int32 SAL_CALL getLong() throw (RuntimeException); + virtual sal_Int32 SAL_CALL getLong() throw (RuntimeException, std::exception); /** get number as hyper */ - virtual sal_Int64 SAL_CALL getHyper() throw (RuntimeException); + virtual sal_Int64 SAL_CALL getHyper() throw (RuntimeException, std::exception); /** get number as float */ - virtual float SAL_CALL getFloat() throw (RuntimeException); + virtual float SAL_CALL getFloat() throw (RuntimeException, std::exception); /** get number as double */ - virtual double SAL_CALL getDouble() throw (RuntimeException); + virtual double SAL_CALL getDouble() throw (RuntimeException, std::exception); /** get string value */ - virtual OUString SAL_CALL getString() throw (RuntimeException); + virtual OUString SAL_CALL getString() throw (RuntimeException, std::exception); }; } |