cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

10 files changed, 48 insertions, 48 deletions

diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index b0787fa7dd3f..c5ee29c26a99 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -129,14 +129,14 @@ OUString Content::getParentURL()
 }
 
 void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
-       throw( uno::RuntimeException )
+       throw( uno::RuntimeException, std::exception )
 {
     //TODO
     //stick a map from each CommandId to a new GCancellable and propogate
     //it throughout the g_file_* calls
 }
 
-OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException )
+OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception )
 {
     return isFolder(uno::Reference< ucb::XCommandEnvironment >())
         ? OUString( GIO_FOLDER_TYPE )
@@ -914,7 +914,7 @@ uno::Any SAL_CALL Content::execute(
         const uno::Reference< ucb::XCommandEnvironment >& xEnv )
     throw( uno::Exception,
            ucb::CommandAbortedException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
 #if OSL_DEBUG_LEVEL > 1
     fprintf(stderr, "Content::execute %s\n", OUStringToOString(aCommand.Name, RTL_TEXTENCODING_UTF8).getStr());
@@ -1139,14 +1139,14 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo(
 }
 
 uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo()
-            throw( uno::RuntimeException )
+            throw( uno::RuntimeException, std::exception )
 {
     return queryCreatableContentsInfo( uno::Reference< ucb::XCommandEnvironment >() );
 }
 
 uno::Reference< ucb::XContent >
     SAL_CALL Content::createNewContent( const ucb::ContentInfo& Info )
-        throw( uno::RuntimeException )
+        throw( uno::RuntimeException, std::exception )
 {
     bool create_document;
     const char *name;
@@ -1188,7 +1188,7 @@ uno::Reference< ucb::XContent >
 }
 
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if ( isFolder( uno::Reference< ucb::XCommandEnvironment >() ) )
     {
@@ -1325,19 +1325,19 @@ void SAL_CALL Content::release() throw()
     ContentImplHelper::release();
 }
 
-uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException )
+uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType, static_cast< ucb::XContentCreator * >( this ) );
     return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface(rType);
 }
 
-OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException )
+OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception )
 {
        return OUString("com.sun.star.comp.GIOContent");
 }
 
 uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
-       throw( uno::RuntimeException )
+       throw( uno::RuntimeException, std::exception )
 {
        uno::Sequence< OUString > aSNS( 1 );
        aSNS.getArray()[ 0 ] = "com.sun.star.ucb.GIOContent";
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index bda3c6255a2a..f55716b613d9 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -152,31 +152,31 @@ public:
 
     virtual OUString SAL_CALL
     getImplementationName()
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual OUString SAL_CALL
     getContentType()
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Any SAL_CALL
         execute( const com::sun::star::ucb::Command& aCommand,
         sal_Int32 CommandId,
         const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment )
-            throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception );
 
     virtual void SAL_CALL abort( sal_Int32 CommandId )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
         SAL_CALL queryCreatableContentsInfo()
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
         SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
     com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
         queryCreatableContentsInfo(
diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx
index 82d7aa0dca1c..49b6b386b3c7 100644
--- a/ucb/source/ucp/gio/gio_inputstream.cxx
+++ b/ucb/source/ucp/gio/gio_inputstream.cxx
@@ -41,13 +41,13 @@ InputStream::~InputStream( void )
 }
 
 sal_Int32 SAL_CALL InputStream::available()
-    throw( io::NotConnectedException, io::IOException, uno::RuntimeException )
+    throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception )
 {
     return 0;
 }
 
 void SAL_CALL InputStream::closeInput()
-    throw( io::NotConnectedException, io::IOException, uno::RuntimeException )
+    throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception )
 {
     if (mpStream)
         g_input_stream_close(G_INPUT_STREAM(mpStream), NULL, NULL);
@@ -55,7 +55,7 @@ void SAL_CALL InputStream::closeInput()
 
 void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip )
     throw( io::NotConnectedException, io::BufferSizeExceededException,
-      io::IOException, uno::RuntimeException )
+      io::IOException, uno::RuntimeException, std::exception )
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -71,7 +71,7 @@ void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip )
 
 sal_Int32 SAL_CALL InputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
     throw( io::NotConnectedException, io::BufferSizeExceededException,
-      io::IOException, uno::RuntimeException )
+      io::IOException, uno::RuntimeException, std::exception )
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -95,12 +95,12 @@ sal_Int32 SAL_CALL InputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal
 
 sal_Int32 SAL_CALL InputStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
     throw( io::NotConnectedException, io::BufferSizeExceededException,
-      io::IOException, uno::RuntimeException )
+      io::IOException, uno::RuntimeException, std::exception )
 {
     return readBytes(aData, nMaxBytesToRead);
 }
 
-uno::Any InputStream::queryInterface( const uno::Type &type ) throw( uno::RuntimeException )
+uno::Any InputStream::queryInterface( const uno::Type &type ) throw( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = ::cppu::queryInterface ( type,
         static_cast< XInputStream * >( this ) );
diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx
index 879e1d9d5b12..8fcc71bd781f 100644
--- a/ucb/source/ucp/gio/gio_inputstream.hxx
+++ b/ucb/source/ucp/gio/gio_inputstream.hxx
@@ -46,7 +46,7 @@ public:
 
     // XInterface
     virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL acquire( void ) throw () { OWeakObject::acquire(); }
     virtual void SAL_CALL release( void ) throw() { OWeakObject::release(); }
 
@@ -56,30 +56,30 @@ public:
             throw( ::com::sun::star::io::NotConnectedException,
                 ::com::sun::star::io::BufferSizeExceededException,
                 ::com::sun::star::io::IOException,
-                ::com::sun::star::uno::RuntimeException );
+                ::com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData,
         sal_Int32 nMaxBytesToRead )
             throw( ::com::sun::star::io::NotConnectedException,
                 ::com::sun::star::io::BufferSizeExceededException,
                 ::com::sun::star::io::IOException,
-                ::com::sun::star::uno::RuntimeException );
+                ::com::sun::star::uno::RuntimeException, std::exception );
 
     virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
             throw( ::com::sun::star::io::NotConnectedException,
                 ::com::sun::star::io::BufferSizeExceededException,
                 ::com::sun::star::io::IOException,
-                ::com::sun::star::uno::RuntimeException );
+                ::com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int32 SAL_CALL available( void )
             throw( ::com::sun::star::io::NotConnectedException,
                 ::com::sun::star::io::IOException,
-                ::com::sun::star::uno::RuntimeException );
+                ::com::sun::star::uno::RuntimeException, std::exception );
 
     virtual void SAL_CALL closeInput( void )
             throw( ::com::sun::star::io::NotConnectedException,
                 ::com::sun::star::io::IOException,
-                ::com::sun::star::uno::RuntimeException );
+                ::com::sun::star::uno::RuntimeException, std::exception );
 };
 
 } // namespace gio
diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx
index 050133ebc9af..b4e4c1291392 100644
--- a/ucb/source/ucp/gio/gio_outputstream.cxx
+++ b/ucb/source/ucp/gio/gio_outputstream.cxx
@@ -42,7 +42,7 @@ OutputStream::~OutputStream( void )
 
 void SAL_CALL OutputStream::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& rData )
     throw( io::NotConnectedException, io::BufferSizeExceededException,
-           io::IOException, uno::RuntimeException)
+           io::IOException, uno::RuntimeException, std::exception)
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -54,7 +54,7 @@ void SAL_CALL OutputStream::writeBytes( const com::sun::star::uno::Sequence< sal
 
 void SAL_CALL OutputStream::flush( void )
     throw( io::NotConnectedException, io::BufferSizeExceededException,
-           io::IOException, uno::RuntimeException )
+           io::IOException, uno::RuntimeException, std::exception )
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -66,13 +66,13 @@ void SAL_CALL OutputStream::flush( void )
 
 void SAL_CALL OutputStream::closeOutput( void )
     throw( io::NotConnectedException, io::IOException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     if (mpStream)
         g_output_stream_close(G_OUTPUT_STREAM(mpStream), NULL, NULL);
 }
 
-uno::Any OutputStream::queryInterface( const uno::Type &type ) throw( uno::RuntimeException )
+uno::Any OutputStream::queryInterface( const uno::Type &type ) throw( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = ::cppu::queryInterface ( type,
         static_cast< XOutputStream * >( this ) );
diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx
index 4c4732a6ef34..37c8b6c8d01d 100644
--- a/ucb/source/ucp/gio/gio_outputstream.hxx
+++ b/ucb/source/ucp/gio/gio_outputstream.hxx
@@ -46,7 +46,7 @@ public:
 
     // XInterface
     virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL acquire( void ) throw () { OWeakObject::acquire(); }
     virtual void SAL_CALL release( void ) throw() { OWeakObject::release(); }
 
@@ -55,19 +55,19 @@ public:
            throw( com::sun::star::io::NotConnectedException,
                   com::sun::star::io::BufferSizeExceededException,
                   com::sun::star::io::IOException,
-                  com::sun::star::uno::RuntimeException);
+                  com::sun::star::uno::RuntimeException, std::exception);
 
    virtual void SAL_CALL flush( void )
            throw( com::sun::star::io::NotConnectedException,
                   com::sun::star::io::BufferSizeExceededException,
                   com::sun::star::io::IOException,
-                  com::sun::star::uno::RuntimeException);
+                  com::sun::star::uno::RuntimeException, std::exception);
 
 
     virtual void SAL_CALL closeOutput( void )
            throw( com::sun::star::io::NotConnectedException,
                   com::sun::star::io::IOException,
-                  com::sun::star::uno::RuntimeException );
+                  com::sun::star::uno::RuntimeException, std::exception );
 };
 
 } // namespace gio
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index fa3c806a1b92..721cb9ec5119 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -34,7 +34,7 @@ ContentProvider::queryContent(
             const uno::Reference<
                     com::sun::star::ucb::XContentIdentifier >& Identifier )
     throw( com::sun::star::ucb::IllegalIdentifierException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
 #if OSL_DEBUG_LEVEL > 1
     fprintf(stderr, "QueryContent: '%s'",
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index 076a9c74a72e..c4c61243baa3 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -50,7 +50,7 @@ public:
     queryContent( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XContentIdentifier >& Identifier )
         throw( ::com::sun::star::ucb::IllegalIdentifierException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
 };
 
 }
diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx
index 0561dbed8b89..26e222a9461b 100644
--- a/ucb/source/ucp/gio/gio_seekable.cxx
+++ b/ucb/source/ucp/gio/gio_seekable.cxx
@@ -40,7 +40,7 @@ Seekable::~Seekable( void )
 }
 
 void SAL_CALL Seekable::truncate( void )
-    throw( io::IOException, uno::RuntimeException )
+    throw( io::IOException, uno::RuntimeException, std::exception )
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -55,7 +55,7 @@ void SAL_CALL Seekable::truncate( void )
 }
 
 void SAL_CALL Seekable::seek( sal_Int64 location )
-    throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception )
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -69,7 +69,7 @@ void SAL_CALL Seekable::seek( sal_Int64 location )
         convertToException(pError, static_cast< cppu::OWeakObject * >(this));
 }
 
-sal_Int64 SAL_CALL Seekable::getPosition() throw( io::IOException, uno::RuntimeException )
+sal_Int64 SAL_CALL Seekable::getPosition() throw( io::IOException, uno::RuntimeException, std::exception )
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -77,7 +77,7 @@ sal_Int64 SAL_CALL Seekable::getPosition() throw( io::IOException, uno::RuntimeE
     return g_seekable_tell(mpStream);
 }
 
-sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeException )
+sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeException, std::exception )
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -117,7 +117,7 @@ sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeExc
     return nSize;
 }
 
-uno::Any Seekable::queryInterface( const uno::Type &type ) throw( uno::RuntimeException )
+uno::Any Seekable::queryInterface( const uno::Type &type ) throw( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = ::cppu::queryInterface ( type,
         static_cast< XSeekable * >( this ) );
diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx
index 1b4fabe5a2f6..eaee55f66cd3 100644
--- a/ucb/source/ucp/gio/gio_seekable.hxx
+++ b/ucb/source/ucp/gio/gio_seekable.hxx
@@ -44,7 +44,7 @@ public:
 
     // XInterface
     virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL acquire( void ) throw () { OWeakObject::acquire(); }
     virtual void SAL_CALL release( void ) throw() { OWeakObject::release(); }
 
@@ -52,20 +52,20 @@ public:
     virtual void SAL_CALL seek( sal_Int64 location )
             throw( ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::io::IOException,
-                ::com::sun::star::uno::RuntimeException );
+                ::com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int64 SAL_CALL getPosition()
             throw( ::com::sun::star::io::IOException,
-                ::com::sun::star::uno::RuntimeException );
+                ::com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int64 SAL_CALL getLength()
             throw( ::com::sun::star::io::IOException,
-                ::com::sun::star::uno::RuntimeException );
+                ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XTruncate
     virtual void SAL_CALL truncate( void )
             throw( com::sun::star::io::IOException,
-                com::sun::star::uno::RuntimeException );
+                com::sun::star::uno::RuntimeException, std::exception );
 };
 
 } // namespace gio