From 55f1443f261dd5b95243f062d7e1419fd861d2b1 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 6 Dec 2007 10:01:37 +0000 Subject: [PATCH] INTEGRATION: CWS os108 (1.4.60); FILE MERGED 2007/11/19 15:25:14 mst 1.4.60.1: - uno/xml/source/dom/*.{hc}xx: add RuntimeException to exception specifications of 172 methods of the DOM implementation where it was missing; fixes #i83675# --- unoxml/source/dom/entityreference.hxx | 16 ++++++++-------- unoxml/source/dom/processinginstruction.hxx | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx index 4dc7c7673f91..11188736d3e9 100644 --- a/unoxml/source/dom/entityreference.hxx +++ b/unoxml/source/dom/entityreference.hxx @@ -4,9 +4,9 @@ * * $RCSfile: entityreference.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ihi $ $Date: 2007-11-19 16:44:17 $ + * last change: $Author: vg $ $Date: 2007-12-06 11:00:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -62,7 +62,7 @@ namespace DOM throw (RuntimeException); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::appendChild(newChild); } @@ -143,7 +143,7 @@ namespace DOM } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::insertBefore(newChild, refChild); } @@ -158,23 +158,23 @@ namespace DOM CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::setPrefix(prefix); } diff --git a/unoxml/source/dom/processinginstruction.hxx b/unoxml/source/dom/processinginstruction.hxx index 1f0f8df1a384..acf49387793f 100644 --- a/unoxml/source/dom/processinginstruction.hxx +++ b/unoxml/source/dom/processinginstruction.hxx @@ -4,9 +4,9 @@ * * $RCSfile: processinginstruction.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ihi $ $Date: 2007-11-19 16:45:23 $ + * last change: $Author: vg $ $Date: 2007-12-06 11:01:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,7 +68,7 @@ namespace DOM /** The content of this processing instruction. */ - virtual void SAL_CALL setData(const OUString& data) throw (DOMException); + virtual void SAL_CALL setData(const OUString& data) throw (RuntimeException, DOMException); // ---- resolve uno inheritance problems... // overrides for XNode base @@ -78,7 +78,7 @@ namespace DOM throw (RuntimeException); // --- delegation for XNde base. virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::appendChild(newChild); } @@ -159,7 +159,7 @@ namespace DOM } virtual Reference< XNode > SAL_CALL insertBefore( const Reference< XNode >& newChild, const Reference< XNode >& refChild) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::insertBefore(newChild, refChild); } @@ -174,23 +174,23 @@ namespace DOM CNode::normalize(); } virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::removeChild(oldChild); } virtual Reference< XNode > SAL_CALL replaceChild( const Reference< XNode >& newChild, const Reference< XNode >& oldChild) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::replaceChild(newChild, oldChild); } virtual void SAL_CALL setNodeValue(const OUString& nodeValue) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::setNodeValue(nodeValue); } virtual void SAL_CALL setPrefix(const OUString& prefix) - throw (DOMException) + throw (RuntimeException, DOMException) { return CNode::setPrefix(prefix); }