cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

6 files changed, 50 insertions, 50 deletions

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);
 
     };
 }