cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

2 files changed, 48 insertions, 48 deletions

diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 4e4d6b9586af..535f87358c91 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -118,78 +118,78 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase,
 
         // XAcceleratorConfiguration
         virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
             throw(css::container::NoSuchElementException,
-            css::uno::RuntimeException            );
+            css::uno::RuntimeException, std::exception            );
 
         virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
             const OUString&    sCommand )
             throw(css::lang::IllegalArgumentException,
-            css::uno::RuntimeException         );
+            css::uno::RuntimeException, std::exception         );
 
         virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
             throw(css::container::NoSuchElementException,
-            css::uno::RuntimeException            );
+            css::uno::RuntimeException, std::exception            );
 
         virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand)
             throw(css::lang::IllegalArgumentException   ,
             css::container::NoSuchElementException,
-            css::uno::RuntimeException            );
+            css::uno::RuntimeException, std::exception            );
 
         virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
             throw(css::lang::IllegalArgumentException   ,
-            css::uno::RuntimeException            );
+            css::uno::RuntimeException, std::exception            );
 
         virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
             throw(css::lang::IllegalArgumentException   ,
             css::container::NoSuchElementException,
-            css::uno::RuntimeException            );
+            css::uno::RuntimeException, std::exception            );
 
         // XUIConfigurationPersistence
         virtual void SAL_CALL reload()
             throw(css::uno::Exception       ,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL store()
             throw(css::uno::Exception       ,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
             throw(css::uno::Exception       ,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
         virtual ::sal_Bool SAL_CALL isModified()
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual ::sal_Bool SAL_CALL isReadOnly()
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // XUIConfigurationStorage
         virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual ::sal_Bool SAL_CALL hasStorage()
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // XUIConfiguration
         virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // XReset
         // TODO use XPresetHandler instead if available
         virtual void SAL_CALL reset()
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // IStorageListener
         virtual void changesOccurred(const OUString& sPath);
@@ -327,91 +327,91 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase,
 
         // XAcceleratorConfiguration
         virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
             throw(css::container::NoSuchElementException,
-            css::uno::RuntimeException            );
+            css::uno::RuntimeException, std::exception            );
 
         virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
             const OUString&    sCommand )
             throw(css::lang::IllegalArgumentException,
-            css::uno::RuntimeException         );
+            css::uno::RuntimeException, std::exception         );
 
         virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
             throw(css::container::NoSuchElementException,
-            css::uno::RuntimeException            );
+            css::uno::RuntimeException, std::exception            );
 
         virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand)
             throw(css::lang::IllegalArgumentException   ,
             css::container::NoSuchElementException,
-            css::uno::RuntimeException            );
+            css::uno::RuntimeException, std::exception            );
 
         virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
             throw(css::lang::IllegalArgumentException   ,
-            css::uno::RuntimeException            );
+            css::uno::RuntimeException, std::exception            );
 
         virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
             throw(css::lang::IllegalArgumentException   ,
             css::container::NoSuchElementException,
-            css::uno::RuntimeException            );
+            css::uno::RuntimeException, std::exception            );
 
         // XUIConfigurationPersistence
         virtual void SAL_CALL reload()
             throw(css::uno::Exception       ,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL store()
             throw(css::uno::Exception       ,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
             throw(css::uno::Exception       ,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
         virtual ::sal_Bool SAL_CALL isModified()
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual ::sal_Bool SAL_CALL isReadOnly()
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // XUIConfigurationStorage
         virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual ::sal_Bool SAL_CALL hasStorage()
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // XUIConfiguration
         virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // XReset
         // TODO use XPresetHandler instead if available
         virtual void SAL_CALL reset()
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // css.util.XChangesListener
         virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // css.lang.XEventListener
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // XComponent
-        virtual  void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
-        virtual  void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-        virtual  void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception);
+        virtual  void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+        virtual  void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         //______________________________________
         // helper for derived classes
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 10e41090c58d..9d13717418f0 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -103,25 +103,25 @@ class LoadDispatcher : private ThreadHelpBase
         virtual void SAL_CALL dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                        const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // XDispatch
         virtual void SAL_CALL dispatch(const css::util::URL&                                  aURL      ,
                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
                                                 const css::util::URL&                                     aURL     )
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
                                                    const css::util::URL&                                     aURL     )
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
         // XSynchronousDispatch
         virtual css::uno::Any SAL_CALL dispatchWithReturnValue( const css::util::URL&                                  aURL      ,
                                                                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
-            throw( css::uno::RuntimeException );
+            throw( css::uno::RuntimeException, std::exception );
 
     private:
         css::uno::Any impl_dispatch( const css::util::URL& rURL,