cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

3 files changed, 33 insertions, 33 deletions

diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index c85d3b7f87f4..09c26d7bc8c3 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -91,26 +91,26 @@ public:
     SplashScreen();
 
     // XStatusIndicator
-    virtual void SAL_CALL end() throw ( RuntimeException );
-    virtual void SAL_CALL reset() throw ( RuntimeException );
-    virtual void SAL_CALL setText(const OUString& aText) throw ( RuntimeException );
-    virtual void SAL_CALL setValue(sal_Int32 nValue) throw ( RuntimeException );
-    virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw ( RuntimeException );
+    virtual void SAL_CALL end() throw ( RuntimeException, std::exception );
+    virtual void SAL_CALL reset() throw ( RuntimeException, std::exception );
+    virtual void SAL_CALL setText(const OUString& aText) throw ( RuntimeException, std::exception );
+    virtual void SAL_CALL setValue(sal_Int32 nValue) throw ( RuntimeException, std::exception );
+    virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw ( RuntimeException, std::exception );
 
     // XInitialize
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments )
-        throw ( RuntimeException );
+        throw ( RuntimeException, std::exception );
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return desktop::splash::getImplementationName(); }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return desktop::splash::getSupportedServiceNames(); }
 
     // workwindow
@@ -162,7 +162,7 @@ SplashScreen::~SplashScreen()
 }
 
 void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     _iMax = nRange;
     if (_bVisible) {
@@ -177,7 +177,7 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
 }
 
 void SAL_CALL SplashScreen::end()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     _iProgress = _iMax;
     if (_bVisible )
@@ -190,7 +190,7 @@ void SAL_CALL SplashScreen::end()
 }
 
 void SAL_CALL SplashScreen::reset()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     _iProgress = 0;
     if (_bVisible && !_bProgressEnd )
@@ -203,7 +203,7 @@ void SAL_CALL SplashScreen::reset()
 }
 
 void SAL_CALL SplashScreen::setText(const OUString& rText)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     if ( _sProgressText != rText )
@@ -221,7 +221,7 @@ void SAL_CALL SplashScreen::setText(const OUString& rText)
 }
 
 void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     SAL_INFO( "desktop.splash", "::SplashScreen::setValue (lo119109)" );
     SAL_INFO( "desktop.splash", "value=" << nValue );
@@ -240,7 +240,7 @@ void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
 // XInitialize
 void SAL_CALL
 SplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     ::osl::ClearableMutexGuard  aGuard( _aMutex );
     if (aArguments.getLength() > 0)
diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx
index 6c1a8293bd62..c084b2f3c484 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -50,12 +50,12 @@ UnxSplashScreen::~UnxSplashScreen()
 }
 
 void SAL_CALL UnxSplashScreen::start( const OUString& /*aText*/, sal_Int32 /*nRange*/ )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL UnxSplashScreen::end()
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "UnxSplashScreen::end()\n" );
@@ -68,7 +68,7 @@ void SAL_CALL UnxSplashScreen::end()
 }
 
 void SAL_CALL UnxSplashScreen::reset()
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "UnxSplashScreen::reset()\n" );
@@ -81,13 +81,13 @@ void SAL_CALL UnxSplashScreen::reset()
 }
 
 void SAL_CALL UnxSplashScreen::setText( const OUString& /*aText*/ )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     // TODO?
 }
 
 void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     if ( m_pOutFd )
     {
@@ -99,7 +99,7 @@ void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
 // XInitialize
 void SAL_CALL
 UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ )
     {
@@ -121,19 +121,19 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::
 }
 
 OUString UnxSplashScreen::getImplementationName()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     return UnxSplash_getImplementationName();
 }
 
 sal_Bool UnxSplashScreen::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> UnxSplashScreen::getSupportedServiceNames()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     return UnxSplash_getSupportedServiceNames();
 }
diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx
index fef8cef89f28..d8e8b62012ce 100644
--- a/desktop/source/splash/unxsplash.hxx
+++ b/desktop/source/splash/unxsplash.hxx
@@ -50,23 +50,23 @@ public:
     UnxSplashScreen( const css::uno::Reference< css::uno::XComponentContext >& xCtx );
 
     // XStatusIndicator
-    virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( css::uno::RuntimeException );
-    virtual void SAL_CALL end() throw ( css::uno::RuntimeException );
-    virtual void SAL_CALL reset() throw ( css::uno::RuntimeException );
-    virtual void SAL_CALL setText( const OUString& aText ) throw ( css::uno::RuntimeException );
-    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL end() throw ( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL reset() throw ( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL setText( const OUString& aText ) throw ( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw ( css::uno::RuntimeException, std::exception );
 
     // XInitialize
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw ( css::uno::RuntimeException, std::exception );
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 };
 
 }