cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

10 files changed, 136 insertions, 136 deletions

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