cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

3 files changed, 15 insertions, 15 deletions

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 50afc78a77e1..2eaf443b6622 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -2296,7 +2296,7 @@ DocumentRenderer::~DocumentRenderer()
 sal_Int32 SAL_CALL DocumentRenderer::getRendererCount (
     const css::uno::Any& aSelection,
     const css::uno::Sequence<css::beans::PropertyValue >& rOptions)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
+    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     (void)aSelection;
     mpImpl->ProcessProperties(rOptions);
@@ -2310,7 +2310,7 @@ Sequence<beans::PropertyValue> SAL_CALL DocumentRenderer::getRenderer (
     sal_Int32 nRenderer,
     const css::uno::Any& rSelection,
     const css::uno::Sequence<css::beans::PropertyValue>& rOptions)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
+    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     (void)nRenderer;
     (void)rSelection;
@@ -2325,7 +2325,7 @@ void SAL_CALL DocumentRenderer::render (
     sal_Int32 nRenderer,
     const css::uno::Any& rSelection,
     const css::uno::Sequence<css::beans::PropertyValue>& rOptions)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
+    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     (void)rSelection;
     mpImpl->ProcessProperties(rOptions);
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index ccb7fab2fcf8..3c5f728b54d9 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -278,7 +278,7 @@ void ViewTabBar::disposing (void)
 
 void SAL_CALL  ViewTabBar::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if (rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent)
         && rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix)
@@ -295,7 +295,7 @@ void SAL_CALL  ViewTabBar::notifyConfigurationChange (
 
 void SAL_CALL ViewTabBar::disposing(
     const lang::EventObject& rEvent)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source == mxConfigurationController)
     {
@@ -312,7 +312,7 @@ void SAL_CALL ViewTabBar::disposing(
 void SAL_CALL ViewTabBar::addTabBarButtonAfter (
     const TabBarButton& rButton,
     const TabBarButton& rAnchor)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     AddTabBarButton(rButton, rAnchor);
@@ -322,7 +322,7 @@ void SAL_CALL ViewTabBar::addTabBarButtonAfter (
 
 
 void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     AddTabBarButton(rButton);
@@ -331,7 +331,7 @@ void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton)
 
 
 void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     RemoveTabBarButton(rButton);
@@ -341,7 +341,7 @@ void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton)
 
 
 sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     return HasTabBarButton(rButton);
@@ -351,7 +351,7 @@ sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton)
 
 
 Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons (void)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     return GetTabBarButtons();
@@ -363,7 +363,7 @@ Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons (void)
 //----- XResource -------------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId (void)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return mxViewTabBarId;
 }
@@ -372,7 +372,7 @@ Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId (void)
 
 
 sal_Bool SAL_CALL ViewTabBar::isAnchorOnly (void)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return false;
 }
@@ -393,7 +393,7 @@ const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId (void)
 }
 
 sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     sal_Int64 nResult = 0;
 
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 5f0012ed50da..7fc0e65e5f1b 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -95,7 +95,7 @@ public:
                             ~ScannerEventListener();
 
     // XEventListener
-    virtual void SAL_CALL   disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException);
+    virtual void SAL_CALL   disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException, std::exception);
 
     void                    ParentDestroyed() { mpParent = NULL; }
 };
@@ -108,7 +108,7 @@ ScannerEventListener::~ScannerEventListener()
 
 
 
-void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException)
+void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException, std::exception)
 {
     if( mpParent )
         mpParent->ScannerEvent( rEventObject );