diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /writerperfect | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'writerperfect')
24 files changed, 206 insertions, 206 deletions
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx index 1a00d23ccf15..0b57b70e9982 100644 --- a/writerperfect/source/draw/CDRImportFilter.cxx +++ b/writerperfect/source/draw/CDRImportFilter.cxx @@ -55,7 +55,7 @@ using com::sun::star::xml::sax::XParser; sal_Bool SAL_CALL CDRImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "CDRImportFilter::filter"); sal_Int32 nLength = aDescriptor.getLength(); @@ -94,14 +94,14 @@ throw (RuntimeException) } void SAL_CALL CDRImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "CDRImportFilter::cancel"); } // XImporter void SAL_CALL CDRImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "CDRImportFilter::setTargetDocument"); mxDoc = xDoc; @@ -109,7 +109,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL CDRImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor ) -throw( com::sun::star::uno::RuntimeException ) +throw( com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO("writerperfect", "CDRImportFilter::detect"); OUString sTypeName; @@ -149,7 +149,7 @@ throw( com::sun::star::uno::RuntimeException ) // XInitialization void SAL_CALL CDRImportFilter::initialize( const Sequence< Any >& aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "CDRImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -195,19 +195,19 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL CDRImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "CDRImportFilter::getImplementationName"); return CDRImportFilter_getImplementationName(); } sal_Bool SAL_CALL CDRImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "CDRImportFilter::supportsService"); return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL CDRImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "CDRImportFilter::getSupportedServiceNames"); return CDRImportFilter_getSupportedServiceNames(); diff --git a/writerperfect/source/draw/CDRImportFilter.hxx b/writerperfect/source/draw/CDRImportFilter.hxx index e0e318feefc1..ff2b22e173d2 100644 --- a/writerperfect/source/draw/CDRImportFilter.hxx +++ b/writerperfect/source/draw/CDRImportFilter.hxx @@ -48,29 +48,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/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx index 63bf9eab127b..2949ce1b4aff 100644 --- a/writerperfect/source/draw/CMXImportFilter.cxx +++ b/writerperfect/source/draw/CMXImportFilter.cxx @@ -55,7 +55,7 @@ using com::sun::star::xml::sax::XParser; sal_Bool SAL_CALL CMXImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "CMXImportFilter::filter"); sal_Int32 nLength = aDescriptor.getLength(); @@ -94,14 +94,14 @@ throw (RuntimeException) } void SAL_CALL CMXImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "CMXImportFilter::cancel"); } // XImporter void SAL_CALL CMXImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "CMXImportFilter::setTargetDocument"); mxDoc = xDoc; @@ -109,7 +109,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL CMXImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor ) -throw( com::sun::star::uno::RuntimeException ) +throw( com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO("writerperfect", "CMXImportFilter::detect"); OUString sTypeName; @@ -149,7 +149,7 @@ throw( com::sun::star::uno::RuntimeException ) // XInitialization void SAL_CALL CMXImportFilter::initialize( const Sequence< Any >& aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "CMXImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -195,19 +195,19 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL CMXImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "CMXImportFilter::getImplementationName"); return CMXImportFilter_getImplementationName(); } sal_Bool SAL_CALL CMXImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "CMXImportFilter::supportsService"); return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL CMXImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "CMXImportFilter::getSupportedServiceNames"); return CMXImportFilter_getSupportedServiceNames(); diff --git a/writerperfect/source/draw/CMXImportFilter.hxx b/writerperfect/source/draw/CMXImportFilter.hxx index 309bfb427bdb..bdf69e20b6e8 100644 --- a/writerperfect/source/draw/CMXImportFilter.hxx +++ b/writerperfect/source/draw/CMXImportFilter.hxx @@ -48,29 +48,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/writerperfect/source/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx index d88976a2c0ee..00520723eedf 100644 --- a/writerperfect/source/draw/FreehandImportFilter.cxx +++ b/writerperfect/source/draw/FreehandImportFilter.cxx @@ -51,7 +51,7 @@ using com::sun::star::xml::sax::XParser; sal_Bool SAL_CALL FreehandImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "FreehandImportFilter::filter"); sal_Int32 nLength = aDescriptor.getLength(); @@ -90,14 +90,14 @@ throw (RuntimeException) } void SAL_CALL FreehandImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "FreehandImportFilter::cancel"); } // XImporter void SAL_CALL FreehandImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "FreehandImportFilter::setTargetDocument"); mxDoc = xDoc; @@ -105,7 +105,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL FreehandImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor ) -throw( com::sun::star::uno::RuntimeException ) +throw( com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO("writerperfect", "FreehandImportFilter::detect"); OUString sTypeName; @@ -145,7 +145,7 @@ throw( com::sun::star::uno::RuntimeException ) // XInitialization void SAL_CALL FreehandImportFilter::initialize( const Sequence< Any >& aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "FreehandImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -191,19 +191,19 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL FreehandImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "FreehandImportFilter::getImplementationName"); return FreehandImportFilter_getImplementationName(); } sal_Bool SAL_CALL FreehandImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "FreehandImportFilter::supportsService"); return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL FreehandImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "FreehandImportFilter::getSupportedServiceNames"); return FreehandImportFilter_getSupportedServiceNames(); diff --git a/writerperfect/source/draw/FreehandImportFilter.hxx b/writerperfect/source/draw/FreehandImportFilter.hxx index b88013cda6a7..527058228b75 100644 --- a/writerperfect/source/draw/FreehandImportFilter.hxx +++ b/writerperfect/source/draw/FreehandImportFilter.hxx @@ -45,29 +45,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/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx index 2330a8b7da75..85b33c3511c6 100644 --- a/writerperfect/source/draw/MSPUBImportFilter.cxx +++ b/writerperfect/source/draw/MSPUBImportFilter.cxx @@ -51,7 +51,7 @@ using com::sun::star::xml::sax::XParser; sal_Bool SAL_CALL MSPUBImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "MSPUBImportFilter::filter"); sal_Int32 nLength = aDescriptor.getLength(); @@ -90,14 +90,14 @@ throw (RuntimeException) } void SAL_CALL MSPUBImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "MSPUBImportFilter::cancel"); } // XImporter void SAL_CALL MSPUBImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "MSPUBImportFilter::setTargetDocument"); mxDoc = xDoc; @@ -105,7 +105,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL MSPUBImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor ) -throw( com::sun::star::uno::RuntimeException ) +throw( com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO("writerperfect", "MSPUBImportFilter::detect"); OUString sTypeName; @@ -145,7 +145,7 @@ throw( com::sun::star::uno::RuntimeException ) // XInitialization void SAL_CALL MSPUBImportFilter::initialize( const Sequence< Any >& aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "MSPUBImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -191,19 +191,19 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL MSPUBImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "MSPUBImportFilter::getImplementationName"); return MSPUBImportFilter_getImplementationName(); } sal_Bool SAL_CALL MSPUBImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "MSPUBImportFilter::supportsService"); return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL MSPUBImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "MSPUBImportFilter::getSupportedServiceNames"); return MSPUBImportFilter_getSupportedServiceNames(); diff --git a/writerperfect/source/draw/MSPUBImportFilter.hxx b/writerperfect/source/draw/MSPUBImportFilter.hxx index 4a7fb8053f97..1e9beab5a4d8 100644 --- a/writerperfect/source/draw/MSPUBImportFilter.hxx +++ b/writerperfect/source/draw/MSPUBImportFilter.hxx @@ -45,29 +45,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/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx index 3d5f1936df85..fb7d2e0a4443 100644 --- a/writerperfect/source/draw/VisioImportFilter.cxx +++ b/writerperfect/source/draw/VisioImportFilter.cxx @@ -51,7 +51,7 @@ using com::sun::star::xml::sax::XParser; sal_Bool SAL_CALL VisioImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "VisioImportFilter::filter"); sal_Int32 nLength = aDescriptor.getLength(); @@ -90,14 +90,14 @@ throw (RuntimeException) } void SAL_CALL VisioImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "VisioImportFilter::cancel"); } // XImporter void SAL_CALL VisioImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "VisioImportFilter::setTargetDocument"); mxDoc = xDoc; @@ -105,7 +105,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL VisioImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor ) -throw( com::sun::star::uno::RuntimeException ) +throw( com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO("writerperfect", "VisioImportFilter::detect"); OUString sTypeName; @@ -145,7 +145,7 @@ throw( com::sun::star::uno::RuntimeException ) // XInitialization void SAL_CALL VisioImportFilter::initialize( const Sequence< Any >& aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "VisioImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -191,19 +191,19 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL VisioImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "VisioImportFilter::getImplementationName"); return VisioImportFilter_getImplementationName(); } sal_Bool SAL_CALL VisioImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "VisioImportFilter::supportsService"); return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL VisioImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "VisioImportFilter::getSupportedServiceNames"); return VisioImportFilter_getSupportedServiceNames(); diff --git a/writerperfect/source/draw/VisioImportFilter.hxx b/writerperfect/source/draw/VisioImportFilter.hxx index 699e2c6cdac5..b778c23faf9a 100644 --- a/writerperfect/source/draw/VisioImportFilter.hxx +++ b/writerperfect/source/draw/VisioImportFilter.hxx @@ -45,29 +45,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/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx index aed95d042f6d..fa1461e81f58 100644 --- a/writerperfect/source/draw/WPGImportFilter.cxx +++ b/writerperfect/source/draw/WPGImportFilter.cxx @@ -57,7 +57,7 @@ using com::sun::star::xml::sax::XParser; sal_Bool SAL_CALL WPGImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "WPGImportFilter::filter"); sal_Int32 nLength = aDescriptor.getLength(); @@ -96,14 +96,14 @@ throw (RuntimeException) } void SAL_CALL WPGImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "WPGImportFilter::cancel"); } // XImporter void SAL_CALL WPGImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "WPGImportFilter::setTargetDocument"); mxDoc = xDoc; @@ -111,7 +111,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL WPGImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor ) -throw( com::sun::star::uno::RuntimeException ) +throw( com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO("writerperfect", "WPGImportFilter::detect"); OUString sTypeName; @@ -151,7 +151,7 @@ throw( com::sun::star::uno::RuntimeException ) // XInitialization void SAL_CALL WPGImportFilter::initialize( const Sequence< Any >& aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "WPGImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -197,19 +197,19 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL WPGImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "WPGImportFilter::getImplementationName"); return WPGImportFilter_getImplementationName(); } sal_Bool SAL_CALL WPGImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "WPGImportFilter::supportsService"); return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL WPGImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "WPGImportFilter::getSupportedServiceNames"); return WPGImportFilter_getSupportedServiceNames(); diff --git a/writerperfect/source/draw/WPGImportFilter.hxx b/writerperfect/source/draw/WPGImportFilter.hxx index 9598b33e4b55..235728f16ffe 100644 --- a/writerperfect/source/draw/WPGImportFilter.hxx +++ b/writerperfect/source/draw/WPGImportFilter.hxx @@ -50,29 +50,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/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index 60c1fcfc4731..6eab1fd8c633 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.cxx +++ b/writerperfect/source/impress/KeynoteImportFilter.cxx @@ -97,7 +97,7 @@ sal_Bool lcl_isPackage( const Any &rComponentData ) } sal_Bool SAL_CALL KeynoteImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "KeynoteImportFilter::filter"); sal_Int32 nLength = aDescriptor.getLength(); @@ -152,14 +152,14 @@ throw (RuntimeException) } void SAL_CALL KeynoteImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "KeynoteImportFilter::cancel"); } // XImporter void SAL_CALL KeynoteImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "KeynoteImportFilter::setTargetDocument"); mxDoc = xDoc; @@ -167,7 +167,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL KeynoteImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor ) -throw( com::sun::star::uno::RuntimeException ) +throw( com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO("writerperfect", "KeynoteImportFilter::detect"); @@ -331,7 +331,7 @@ throw( com::sun::star::uno::RuntimeException ) // XInitialization void SAL_CALL KeynoteImportFilter::initialize( const Sequence< Any >& aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "KeynoteImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -384,21 +384,21 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL KeynoteImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "KeynoteImportFilter::getImplementationName"); return KeynoteImportFilter_getImplementationName(); } sal_Bool SAL_CALL KeynoteImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "KeynoteImportFilter::supportsService"); return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL KeynoteImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "KeynoteImportFilter::getSupportedServiceNames"); return KeynoteImportFilter_getSupportedServiceNames(); diff --git a/writerperfect/source/impress/KeynoteImportFilter.hxx b/writerperfect/source/impress/KeynoteImportFilter.hxx index 05d235b71af9..da8df33f71c9 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.hxx +++ b/writerperfect/source/impress/KeynoteImportFilter.hxx @@ -45,29 +45,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/writerperfect/source/writer/AbiWordImportFilter.cxx b/writerperfect/source/writer/AbiWordImportFilter.cxx index 69d01bae81a0..6c10871c8e89 100644 --- a/writerperfect/source/writer/AbiWordImportFilter.cxx +++ b/writerperfect/source/writer/AbiWordImportFilter.cxx @@ -97,20 +97,20 @@ throw (RuntimeException) } sal_Bool SAL_CALL AbiWordImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "AbiWordImportFilter::filter"); return importImpl ( aDescriptor ); } void SAL_CALL AbiWordImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "AbiWordImportFilter::cancel"); } // XImporter void SAL_CALL AbiWordImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "AbiWordImportFilter::getTargetDocument"); mxDoc = xDoc; @@ -118,7 +118,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL AbiWordImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor ) -throw( com::sun::star::uno::RuntimeException ) +throw( com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO("writerperfect", "AbiWordImportFilter::detect"); @@ -160,7 +160,7 @@ throw( com::sun::star::uno::RuntimeException ) // XInitialization void SAL_CALL AbiWordImportFilter::initialize( const Sequence< Any >& aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "AbiWordImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -205,17 +205,17 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL AbiWordImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return AbiWordImportFilter_getImplementationName(); } sal_Bool SAL_CALL AbiWordImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL AbiWordImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return AbiWordImportFilter_getSupportedServiceNames(); } diff --git a/writerperfect/source/writer/AbiWordImportFilter.hxx b/writerperfect/source/writer/AbiWordImportFilter.hxx index dec139276dd2..9e6dabb9cf9e 100644 --- a/writerperfect/source/writer/AbiWordImportFilter.hxx +++ b/writerperfect/source/writer/AbiWordImportFilter.hxx @@ -47,29 +47,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/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx index ff1ec210ff74..9110c67c2faf 100644 --- a/writerperfect/source/writer/EBookImportFilter.cxx +++ b/writerperfect/source/writer/EBookImportFilter.cxx @@ -117,20 +117,20 @@ throw (RuntimeException) } sal_Bool SAL_CALL EBookImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "EBookImportFilter::filter"); return importImpl ( aDescriptor ); } void SAL_CALL EBookImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "EBookImportFilter::cancel"); } // XImporter void SAL_CALL EBookImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "EBookImportFilter::getTargetDocument"); mxDoc = xDoc; @@ -138,7 +138,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL EBookImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor ) -throw( com::sun::star::uno::RuntimeException ) +throw( com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO("writerperfect", "EBookImportFilter::detect"); @@ -190,7 +190,7 @@ throw( com::sun::star::uno::RuntimeException ) // XInitialization void SAL_CALL EBookImportFilter::initialize( const Sequence< Any >& aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "EBookImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -235,17 +235,17 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL EBookImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return EBookImportFilter_getImplementationName(); } sal_Bool SAL_CALL EBookImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL EBookImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return EBookImportFilter_getSupportedServiceNames(); } diff --git a/writerperfect/source/writer/EBookImportFilter.hxx b/writerperfect/source/writer/EBookImportFilter.hxx index 3e844d78b49f..55b415228ceb 100644 --- a/writerperfect/source/writer/EBookImportFilter.hxx +++ b/writerperfect/source/writer/EBookImportFilter.hxx @@ -47,29 +47,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/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index 888e005d73a5..e22fc1d8bf64 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -97,20 +97,20 @@ throw (RuntimeException) } sal_Bool SAL_CALL MSWorksImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "MSWorksImportFilter::filter"); return importImpl ( aDescriptor ); } void SAL_CALL MSWorksImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "MSWorksImportFilter::cancel"); } // XImporter void SAL_CALL MSWorksImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "MSWorksImportFilter::getTargetDocument"); mxDoc = xDoc; @@ -118,7 +118,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL MSWorksImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor ) -throw( com::sun::star::uno::RuntimeException ) +throw( com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO("writerperfect", "MSWorksImportFilter::detect"); @@ -163,7 +163,7 @@ throw( com::sun::star::uno::RuntimeException ) // XInitialization void SAL_CALL MSWorksImportFilter::initialize( const Sequence< Any >& aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "MSWorksImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -208,17 +208,17 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL MSWorksImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return MSWorksImportFilter_getImplementationName(); } sal_Bool SAL_CALL MSWorksImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL MSWorksImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return MSWorksImportFilter_getSupportedServiceNames(); } diff --git a/writerperfect/source/writer/MSWorksImportFilter.hxx b/writerperfect/source/writer/MSWorksImportFilter.hxx index 08ff2314bbea..6b6c6aa596af 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.hxx +++ b/writerperfect/source/writer/MSWorksImportFilter.hxx @@ -47,29 +47,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/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx index ed12e562fd3b..82d2e260187b 100644 --- a/writerperfect/source/writer/MWAWImportFilter.cxx +++ b/writerperfect/source/writer/MWAWImportFilter.cxx @@ -97,20 +97,20 @@ throw (RuntimeException) } sal_Bool SAL_CALL MWAWImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue > &aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "MWAWImportFilter::filter"); return importImpl ( aDescriptor ); } void SAL_CALL MWAWImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "MWAWImportFilter::cancel"); } // XImporter void SAL_CALL MWAWImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent > &xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "MWAWImportFilter::getTargetDocument"); mxDoc = xDoc; @@ -118,7 +118,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL MWAWImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue > &Descriptor ) -throw( com::sun::star::uno::RuntimeException ) +throw( com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO("writerperfect", "MWAWImportFilter::detect"); @@ -264,7 +264,7 @@ throw( com::sun::star::uno::RuntimeException ) // XInitialization void SAL_CALL MWAWImportFilter::initialize( const Sequence< Any > &aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "MWAWImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -307,17 +307,17 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL MWAWImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return MWAWImportFilter_getImplementationName(); } sal_Bool SAL_CALL MWAWImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL MWAWImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return MWAWImportFilter_getSupportedServiceNames(); } diff --git a/writerperfect/source/writer/MWAWImportFilter.hxx b/writerperfect/source/writer/MWAWImportFilter.hxx index ca28db768bbf..03fd8c4e4fd2 100644 --- a/writerperfect/source/writer/MWAWImportFilter.hxx +++ b/writerperfect/source/writer/MWAWImportFilter.hxx @@ -47,29 +47,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/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index fca2faa3d211..0d5f65005713 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -150,20 +150,20 @@ throw (RuntimeException) } sal_Bool SAL_CALL WordPerfectImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "WordPerfectImportFilter::filter"); return importImpl ( aDescriptor ); } void SAL_CALL WordPerfectImportFilter::cancel( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO("writerperfect", "WordPerfectImportFilter::cancel"); } // XImporter void SAL_CALL WordPerfectImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { SAL_INFO("writerperfect", "WordPerfectImportFilter::getTargetDocument"); mxDoc = xDoc; @@ -171,7 +171,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) // XExtendedFilterDetection OUString SAL_CALL WordPerfectImportFilter::detect( Sequence< PropertyValue >& Descriptor ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { SAL_INFO("writerperfect", "WordPerfectImportFilter::detect"); @@ -216,7 +216,7 @@ throw( RuntimeException ) // XInitialization void SAL_CALL WordPerfectImportFilter::initialize( const Sequence< Any >& aArguments ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { SAL_INFO("writerperfect", "WordPerfectImportFilter::initialize"); Sequence < PropertyValue > aAnySeq; @@ -259,17 +259,17 @@ throw( Exception ) // XServiceInfo OUString SAL_CALL WordPerfectImportFilter::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return WordPerfectImportFilter_getImplementationName(); } sal_Bool SAL_CALL WordPerfectImportFilter::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL WordPerfectImportFilter::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return WordPerfectImportFilter_getSupportedServiceNames(); } @@ -283,12 +283,12 @@ WordPerfectImportFilterDialog::~WordPerfectImportFilterDialog() } void SAL_CALL WordPerfectImportFilterDialog::setTitle( const OUString & ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { } sal_Int16 SAL_CALL WordPerfectImportFilterDialog::execute() -throw (RuntimeException) +throw (RuntimeException, std::exception) { WPXSvInputStream input( mxInputStream ); @@ -318,7 +318,7 @@ throw (RuntimeException) return com::sun::star::ui::dialogs::ExecutableDialogResults::OK; } -Sequence<PropertyValue> SAL_CALL WordPerfectImportFilterDialog::getPropertyValues() throw(RuntimeException) +Sequence<PropertyValue> SAL_CALL WordPerfectImportFilterDialog::getPropertyValues() throw(RuntimeException, std::exception) { Sequence<PropertyValue> aRet(1); PropertyValue *pArray = aRet.getArray(); @@ -331,7 +331,7 @@ Sequence<PropertyValue> SAL_CALL WordPerfectImportFilterDialog::getPropertyValue void SAL_CALL WordPerfectImportFilterDialog::setPropertyValues( const Sequence<PropertyValue>& aProps) throw(com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, - com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, RuntimeException) + com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception) { const PropertyValue *pPropArray = aProps.getConstArray(); long nPropCount = aProps.getLength(); @@ -350,19 +350,19 @@ throw(com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::Pr // XServiceInfo OUString SAL_CALL WordPerfectImportFilterDialog::getImplementationName( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return WordPerfectImportFilterDialog_getImplementationName(); } sal_Bool SAL_CALL WordPerfectImportFilterDialog::supportsService( const OUString &rServiceName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL WordPerfectImportFilterDialog::getSupportedServiceNames( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return WordPerfectImportFilterDialog_getSupportedServiceNames(); } diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx index caad6cff7765..f00961481ca5 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.hxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx @@ -51,29 +51,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); }; @@ -105,28 +105,28 @@ class WordPerfectImportFilterDialog : public cppu::WeakImplHelper3 < // XExecutableDialog virtual void SAL_CALL setTitle( const OUString &aTitle ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL execute() - throw (::com::sun::star::uno::RuntimeException); + throw (::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); // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException); + SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: WordPerfectImportFilterDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext); |