cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

4 files changed, 29 insertions, 29 deletions

diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx
index 294d24def47c..57cf05b60b11 100644
--- a/hwpfilter/source/attributes.cxx
+++ b/hwpfilter/source/attributes.cxx
@@ -47,7 +47,7 @@ struct AttributeListImpl_impl
     std::vector<struct TagAttribute> vecAttribute;
 };
 
-sal_Int16 SAL_CALL AttributeListImpl::getLength(void) throw (RuntimeException)
+sal_Int16 SAL_CALL AttributeListImpl::getLength(void) throw (RuntimeException, std::exception)
 {
     return (sal_Int16)m_pImpl->vecAttribute.size();
 }
@@ -61,7 +61,7 @@ cppu::WeakImplHelper1<com::sun::star::xml::sax::XAttributeList>( r )
 }
 
 
-OUString AttributeListImpl::getNameByIndex(sal_Int16 i) throw (RuntimeException)
+OUString AttributeListImpl::getNameByIndex(sal_Int16 i) throw (RuntimeException, std::exception)
 {
     sal_uInt32 i2 = sal::static_int_cast<sal_Int16>(i);
     if( i >= 0 &&  i2 < m_pImpl->vecAttribute.size() )
@@ -72,7 +72,7 @@ OUString AttributeListImpl::getNameByIndex(sal_Int16 i) throw (RuntimeException)
 }
 
 
-OUString AttributeListImpl::getTypeByIndex(sal_Int16 i) throw (RuntimeException)
+OUString AttributeListImpl::getTypeByIndex(sal_Int16 i) throw (RuntimeException, std::exception)
 {
     sal_uInt32 i2 = sal::static_int_cast<sal_Int16>(i);
     if( i >= 0 &&  i2 < m_pImpl->vecAttribute.size() )
@@ -83,7 +83,7 @@ OUString AttributeListImpl::getTypeByIndex(sal_Int16 i) throw (RuntimeException)
 }
 
 
-OUString AttributeListImpl::getValueByIndex(sal_Int16 i) throw (RuntimeException)
+OUString AttributeListImpl::getValueByIndex(sal_Int16 i) throw (RuntimeException, std::exception)
 {
     sal_uInt32 i2 = sal::static_int_cast<sal_Int16>(i);
     if( i >= 0 &&  i2 < m_pImpl->vecAttribute.size() )
@@ -95,7 +95,7 @@ OUString AttributeListImpl::getValueByIndex(sal_Int16 i) throw (RuntimeException
 }
 
 
-OUString AttributeListImpl::getTypeByName( const OUString& sName ) throw (RuntimeException)
+OUString AttributeListImpl::getTypeByName( const OUString& sName ) throw (RuntimeException, std::exception)
 {
     std::vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
 
@@ -110,7 +110,7 @@ OUString AttributeListImpl::getTypeByName( const OUString& sName ) throw (Runtim
 }
 
 
-OUString AttributeListImpl::getValueByName(const OUString& sName) throw (RuntimeException)
+OUString AttributeListImpl::getValueByName(const OUString& sName) throw (RuntimeException, std::exception)
 {
     std::vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
 
diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx
index 498868c8f099..c56592de3b8d 100644
--- a/hwpfilter/source/attributes.hxx
+++ b/hwpfilter/source/attributes.hxx
@@ -46,12 +46,12 @@ public:
     AttributeListImpl( const AttributeListImpl & );
 
 public:
-    virtual sal_Int16 SAL_CALL getLength(void) throw (RuntimeException);
-    virtual OUString  SAL_CALL getNameByIndex(sal_Int16 i) throw (RuntimeException);
-    virtual OUString  SAL_CALL getTypeByIndex(sal_Int16 i) throw (RuntimeException);
-    virtual OUString  SAL_CALL getTypeByName(const OUString& aName) throw (RuntimeException);
-    virtual OUString  SAL_CALL getValueByIndex(sal_Int16 i) throw (RuntimeException);
-    virtual OUString  SAL_CALL getValueByName(const OUString& aName) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getLength(void) throw (RuntimeException, std::exception);
+    virtual OUString  SAL_CALL getNameByIndex(sal_Int16 i) throw (RuntimeException, std::exception);
+    virtual OUString  SAL_CALL getTypeByIndex(sal_Int16 i) throw (RuntimeException, std::exception);
+    virtual OUString  SAL_CALL getTypeByName(const OUString& aName) throw (RuntimeException, std::exception);
+    virtual OUString  SAL_CALL getValueByIndex(sal_Int16 i) throw (RuntimeException, std::exception);
+    virtual OUString  SAL_CALL getValueByName(const OUString& aName) throw (RuntimeException, std::exception);
 
 public:
     void addAttribute( const OUString &sName , const OUString &sType , const OUString &sValue );
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 7b6d6985c84a..0134d5b46d86 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -123,7 +123,7 @@ HwpReader::~HwpReader()
 }
 
 
-sal_Bool HwpReader::filter(const Sequence< PropertyValue >& rDescriptor) throw(RuntimeException)
+sal_Bool HwpReader::filter(const Sequence< PropertyValue >& rDescriptor) throw(RuntimeException, std::exception)
 {
     utl::MediaDescriptor aDescriptor(rDescriptor);
     aDescriptor.addInputStream();
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 634ebbf8b13b..52934e383654 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -85,8 +85,8 @@ public:
     /**
      * parseStream does Parser-startup initializations
      */
-    virtual sal_Bool SAL_CALL filter(const Sequence< PropertyValue >& aDescriptor) throw (RuntimeException);
-    virtual void SAL_CALL cancel() throw(RuntimeException) {}
+    virtual sal_Bool SAL_CALL filter(const Sequence< PropertyValue >& aDescriptor) throw (RuntimeException, std::exception);
+    virtual void SAL_CALL cancel() throw(RuntimeException, std::exception) {}
     virtual void SAL_CALL setDocumentHandler(Reference< XDocumentHandler > xHandler)
     {
         m_rxDocumentHandler = xHandler;
@@ -167,20 +167,20 @@ public:
 public:
     // XFilter
     virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor )
-        throw( RuntimeException );
-    virtual void SAL_CALL cancel() throw(RuntimeException);
+        throw( RuntimeException, std::exception );
+    virtual void SAL_CALL cancel() throw(RuntimeException, std::exception);
 
     // XImporter
     virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc)
-        throw( IllegalArgumentException, RuntimeException );
+        throw( IllegalArgumentException, RuntimeException, std::exception );
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw (RuntimeException);
-    Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException);
-    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException);
+    OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception);
+    Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException, std::exception);
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     //XExtendedFilterDetection
-    virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
 public:
     Reference< XFilter > rFilter;
@@ -229,19 +229,19 @@ HwpImportFilter::~HwpImportFilter()
 }
 
 sal_Bool HwpImportFilter::filter( const Sequence< PropertyValue >& aDescriptor )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     // delegate to IchitaroImpoter
     return rFilter->filter( aDescriptor );
 }
 
-void HwpImportFilter::cancel() throw(::com::sun::star::uno::RuntimeException)
+void HwpImportFilter::cancel() throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     rFilter->cancel();
 }
 
 void HwpImportFilter::setTargetDocument( const Reference< XComponent >& xDoc )
-    throw( IllegalArgumentException, RuntimeException )
+    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
         // delegate
     rImporter->setTargetDocument( xDoc );
@@ -252,18 +252,18 @@ OUString HwpImportFilter::getImplementationName_Static() throw()
     return OUString( IMPLEMENTATION_NAME );
 }
 
-OUString HwpImportFilter::getImplementationName() throw(::com::sun::star::uno::RuntimeException)
+OUString HwpImportFilter::getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     return OUString( IMPLEMENTATION_NAME );
 }
 
-sal_Bool HwpImportFilter::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
+sal_Bool HwpImportFilter::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 //XExtendedFilterDetection
-OUString HwpImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw (::com::sun::star::uno::RuntimeException)
+OUString HwpImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     OUString sTypeName;
 
@@ -289,7 +289,7 @@ OUString HwpImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::s
     return sTypeName;
 }
 
-Sequence< OUString> HwpImportFilter::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
+Sequence< OUString> HwpImportFilter::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString* pArray = aRet.getArray();