cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

4 files changed, 34 insertions, 34 deletions

diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 72697f9dabdd..5e028d2f0803 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -261,18 +261,18 @@ sal_Bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< ::com::s
 }
 
 sal_Bool SAL_CALL LotusWordProImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return importImpl ( aDescriptor );
 }
 void SAL_CALL LotusWordProImportFilter::cancel(  )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
 }
 
 // XImporter
 void SAL_CALL LotusWordProImportFilter::setTargetDocument( const uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
-    throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException)
+    throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     meType = FILTER_IMPORT;
     mxDoc = xDoc;
@@ -280,7 +280,7 @@ void SAL_CALL LotusWordProImportFilter::setTargetDocument( const uno::Reference<
 
 // XExtendedFilterDetection
 OUString SAL_CALL LotusWordProImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor )
-    throw( com::sun::star::uno::RuntimeException )
+    throw( com::sun::star::uno::RuntimeException, std::exception )
 {
 
     OUString sTypeName( "writer_LotusWordPro_Document" );
@@ -326,7 +326,7 @@ OUString SAL_CALL LotusWordProImportFilter::detect( com::sun::star::uno::Sequenc
 
 // XInitialization
 void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& aArguments )
-    throw (Exception, RuntimeException)
+    throw (Exception, RuntimeException, std::exception)
 {
     Sequence < PropertyValue > aAnySeq;
     sal_Int32 nLength = aArguments.getLength();
@@ -375,17 +375,17 @@ uno::Reference< XInterface > SAL_CALL LotusWordProImportFilter_createInstance( c
 
 // XServiceInfo
 OUString SAL_CALL LotusWordProImportFilter::getImplementationName(  )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return LotusWordProImportFilter_getImplementationName();
 }
 sal_Bool SAL_CALL LotusWordProImportFilter::supportsService( const OUString& rServiceName )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 Sequence< OUString > SAL_CALL LotusWordProImportFilter::getSupportedServiceNames(  )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return LotusWordProImportFilter_getSupportedServiceNames();
 }
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index f2c7a5544fc0..9e014144b966 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -67,29 +67,29 @@ public:
 
     // XFilter
         virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL cancel(  )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     // XImporter
         virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
 
     //XExtendedFilterDetection
     virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInitialization
         virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-        throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
 
     // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        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);
 
 };
 
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 9a1ff67ddd04..50948172d75e 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -109,7 +109,7 @@ LWPFilterReader::~LWPFilterReader()
 }
 
 sal_Bool LWPFilterReader::filter( const Sequence< PropertyValue >& aDescriptor )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     OUString sURL;
     for( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ )
@@ -126,7 +126,7 @@ sal_Bool LWPFilterReader::filter( const Sequence< PropertyValue >& aDescriptor )
     return (ReadWordproFile(inputStream, m_DocumentHandler) == 0);
 }
 
-void LWPFilterReader::cancel() throw (com::sun::star::uno::RuntimeException)
+void LWPFilterReader::cancel() throw (com::sun::star::uno::RuntimeException, std::exception)
 {
 }
 
@@ -163,35 +163,35 @@ LWPFilterImportFilter::~LWPFilterImportFilter()
 }
 
 sal_Bool LWPFilterImportFilter::filter( const Sequence< PropertyValue >& aDescriptor )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     sal_Bool ret =  rFilter->filter( aDescriptor );
 
     return ret;
 }
 
-void LWPFilterImportFilter::cancel() throw (::com::sun::star::uno::RuntimeException)
+void LWPFilterImportFilter::cancel() throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     rFilter->cancel();
 }
 
 void LWPFilterImportFilter::setTargetDocument( const uno::Reference< XComponent >& xDoc )
-    throw( IllegalArgumentException, RuntimeException )
+    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     rImporter->setTargetDocument( xDoc );
 }
 
-OUString LWPFilterImportFilter::getImplementationName() throw()
+OUString LWPFilterImportFilter::getImplementationName() throw(std::exception)
 {
     return OUString( STR_IMPLEMENTATION_NAME );
 }
 
-sal_Bool LWPFilterImportFilter::supportsService( const OUString& ServiceName ) throw()
+sal_Bool LWPFilterImportFilter::supportsService( const OUString& ServiceName ) throw(std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) throw()
+Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) throw(std::exception)
 {
     Sequence< OUString > seq(1);
     seq[0] = STR_SERVICE_NAME;
@@ -200,7 +200,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
 
 
 OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-        throw (::com::sun::star::uno::RuntimeException)
+        throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     OUString   ret;
     OUString aTypeName;            // a name describing the type (from MediaDescriptor, usually from flat detection)
diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx
index de61d961615f..cbd904c3d251 100644
--- a/lotuswordpro/source/filter/lwpfilter.hxx
+++ b/lotuswordpro/source/filter/lwpfilter.hxx
@@ -104,12 +104,12 @@ public:
      *          get which file to import.
      */
     virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor )
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
 
     /**
      * @descr   stop loading the file.
      */
-    virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception);
 
     /**
      * @descr   get the XDocumentHandler interface.
@@ -139,29 +139,29 @@ public:
      * @descr   see LWPFilterReader::filter.
      */
     virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor )
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
 
     /**
      * @descr   see LWPFilterReader::cancel.
      */
-    virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception);
 
     // XImporter
     virtual void SAL_CALL setTargetDocument( const uno::Reference< XComponent >& xDoc)
-        throw( IllegalArgumentException, RuntimeException );
+        throw( IllegalArgumentException, RuntimeException, std::exception );
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw ();
+    OUString SAL_CALL getImplementationName() throw (std::exception);
 
-    Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw ();
+    Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception);
 
-    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw ();
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception);
 
     /**
      * @descr   function of interface XExtendedFilterDetection. If this interface is registered, it will be called whenever
      *          a file is to be loaded.
      */
-    virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
 public:
     uno::Reference< XFilter > rFilter;