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/source/impress | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'writerperfect/source/impress')
-rw-r--r-- | writerperfect/source/impress/KeynoteImportFilter.cxx | 16 | ||||
-rw-r--r-- | writerperfect/source/impress/KeynoteImportFilter.hxx | 16 |
2 files changed, 16 insertions, 16 deletions
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); }; |