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 /filter/source | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'filter/source')
60 files changed, 426 insertions, 426 deletions
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 1d33f5f0e9e4..e3eb3637d2b6 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -153,7 +153,7 @@ FilterCache* BaseContainer::impl_getWorkingCache() const OUString SAL_CALL BaseContainer::getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -164,13 +164,13 @@ OUString SAL_CALL BaseContainer::getImplementationName() sal_Bool SAL_CALL BaseContainer::supportsService(const OUString& sServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence< OUString > SAL_CALL BaseContainer::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -185,7 +185,7 @@ void SAL_CALL BaseContainer::insertByName(const OUString& sItem , throw (css::lang::IllegalArgumentException , css::container::ElementExistException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { if (sItem.isEmpty()) throw css::lang::IllegalArgumentException("empty value not allowed as item name.", @@ -224,7 +224,7 @@ void SAL_CALL BaseContainer::insertByName(const OUString& sItem , void SAL_CALL BaseContainer::removeByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { impl_loadOnDemand(); @@ -248,7 +248,7 @@ void SAL_CALL BaseContainer::replaceByName(const OUString& sItem , throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { if (sItem.isEmpty()) throw css::lang::IllegalArgumentException("empty value not allowed as item name.", @@ -287,7 +287,7 @@ void SAL_CALL BaseContainer::replaceByName(const OUString& sItem , css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { if (sItem.isEmpty()) throw css::container::NoSuchElementException( "An empty item cant be part of this cache!", @@ -326,7 +326,7 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem) css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > lNames; @@ -355,7 +355,7 @@ css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames() sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { sal_Bool bHasOne = sal_False; @@ -383,7 +383,7 @@ sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem) css::uno::Type SAL_CALL BaseContainer::getElementType() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // no lock necessary - because the type of our items // is fix! no internal call or member needed ... @@ -393,7 +393,7 @@ css::uno::Type SAL_CALL BaseContainer::getElementType() sal_Bool SAL_CALL BaseContainer::hasElements() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { sal_Bool bHasSome = sal_False; @@ -421,7 +421,7 @@ sal_Bool SAL_CALL BaseContainer::hasElements() css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const OUString& /* sQuery */ ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { OSL_FAIL("not pure virtual ... but not really implemented .-)"); @@ -432,7 +432,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Reference< css::container::XEnumeration > xEnum; OUStringList lKeys; @@ -481,7 +481,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea void SAL_CALL BaseContainer::flush() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -558,7 +558,7 @@ void SAL_CALL BaseContainer::flush() void SAL_CALL BaseContainer::addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // no locks necessary // used helper lives if we live and is threadsafe by itself ... @@ -569,7 +569,7 @@ void SAL_CALL BaseContainer::addFlushListener(const css::uno::Reference< css::ut void SAL_CALL BaseContainer::removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // no locks necessary // used helper lives if we live and is threadsafe by itself ... diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index b855f4f86964..647cd52d38b2 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -215,13 +215,13 @@ class BaseContainer : public BaseLock // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); //--------------------------------------- // XNameContainer @@ -231,12 +231,12 @@ class BaseContainer : public BaseLock throw (css::lang::IllegalArgumentException , css::container::ElementExistException, css::lang::WrappedTargetException , - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); //--------------------------------------- // XNameReplace @@ -246,7 +246,7 @@ class BaseContainer : public BaseLock throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); //--------------------------------------- // XElementAccess @@ -254,19 +254,19 @@ class BaseContainer : public BaseLock virtual css::uno::Any SAL_CALL getByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName(const OUString& sItem) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); //--------------------------------------- // XContainerQuery @@ -275,22 +275,22 @@ class BaseContainer : public BaseLock // We implement return of an empty result here only! // But we show an assertion :-) virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); //--------------------------------------- // XFlushable virtual void SAL_CALL flush() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); }; } // namespace config diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx index e32704739533..b00c0f076f20 100644 --- a/filter/source/config/cache/cacheupdatelistener.cxx +++ b/filter/source/config/cache/cacheupdatelistener.cxx @@ -82,7 +82,7 @@ void CacheUpdateListener::stopListening() void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEvent& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -182,7 +182,7 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven void SAL_CALL CacheUpdateListener::disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index bd0f34dd16ef..89c8d724a3f6 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -109,12 +109,12 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante // XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //--------------------------------------- // lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); }; } // namespace config diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index 8e53aef0c9f0..b2815981af12 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -38,26 +38,26 @@ ConfigFlush::~ConfigFlush() } OUString SAL_CALL ConfigFlush::getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return impl_getImplementationName(); // <- SAFE } sal_Bool SAL_CALL ConfigFlush::supportsService(const OUString& sServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence< OUString > SAL_CALL ConfigFlush::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return impl_getSupportedServiceNames(); } void SAL_CALL ConfigFlush::refresh() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // notify listener outside the lock! // The used listener helper lives if we live @@ -90,7 +90,7 @@ void SAL_CALL ConfigFlush::refresh() void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // no locks necessary // used helper lives if we live and is threadsafe by itself ... @@ -100,7 +100,7 @@ void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::ut void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // no locks necessary // used helper lives if we live and is threadsafe by itself ... diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index 7fa9f98de3e4..6595a514bde4 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -83,25 +83,25 @@ class ConfigFlush : public BaseLock // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); //--------------------------------------- // XRefreshable virtual void SAL_CALL refresh() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //--------------------------------------- // interface to register/create this instance as an UNO service diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 084ed4dbf609..5533800c2b91 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -51,7 +51,7 @@ ContentHandlerFactory::~ContentHandlerFactory() css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstance(const OUString& sHandler) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { return createInstanceWithArguments(sHandler, css::uno::Sequence< css::uno::Any >()); } @@ -61,7 +61,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstanceWithArguments(const OUString& sHandler , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { css::uno::Reference< css::uno::XInterface > xHandler; @@ -140,7 +140,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea css::uno::Sequence< OUString > SAL_CALL ContentHandlerFactory::getAvailableServiceNames() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // must be the same list as ((XNameAccess*)this)->getElementNames() return! return BaseContainer::getElementNames(); diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index 9cb44e4af4a8..d65a62930286 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -71,15 +71,15 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sHandler) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sHandler , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //------------------------------------------- // static uno helper! @@ -128,21 +128,21 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain // Overrides to resolve ambiguity - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::getByName(aName); } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::getElementNames(); } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::hasByName(aName); } - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::getElementType(); } - virtual ::sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::hasElements(); } - virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::createSubSetEnumerationByQuery(Query); } - virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const ::com::sun::star::uno::Sequence< css::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const ::com::sun::star::uno::Sequence< css::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::createSubSetEnumerationByProperties(Properties); } diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index e1dba62e19a3..707f0ae8def3 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -69,7 +69,7 @@ FilterFactory::~FilterFactory() css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstance(const OUString& sFilter) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { return createInstanceWithArguments(sFilter, css::uno::Sequence< css::uno::Any >()); } @@ -79,7 +79,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstanceWithArguments(const OUString& sFilter , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -158,7 +158,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { /* Attention: Instead of getElementNames() this method have to return only filter names, which can be created as UNO Services really. Thats why we search for filters, @@ -186,7 +186,7 @@ css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames( css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::createSubSetEnumerationByQuery(const OUString& sQuery) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // reject old deprecated queries ... if (sQuery.matchAsciiL("_filterquery_",13,0)) diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 63f836823956..3fc3a5b11321 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -72,21 +72,21 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sFilter) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sFilter , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //--------------------------------------- // XContainerQuery virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); //------------------------------------------- // internal helper! diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index e937aed9d340..d14188851f3b 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -50,7 +50,7 @@ FrameLoaderFactory::~FrameLoaderFactory() css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstance(const OUString& sLoader) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { return createInstanceWithArguments(sLoader, css::uno::Sequence< css::uno::Any >()); } @@ -60,7 +60,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstanceWithArguments(const OUString& sLoader , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -137,7 +137,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI css::uno::Sequence< OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceNames() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // must be the same list as ((XNameAccess*)this)->getElementNames() return! return BaseContainer::getElementNames(); diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index 21ffba461fd3..bbe6209d824e 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -71,15 +71,15 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sLoader) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sLoader , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //------------------------------------------- // static uno helper! @@ -127,21 +127,21 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); // Overrides to resolve ambiguity - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::getByName(aName); } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::getElementNames(); } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::hasByName(aName); } - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::getElementType(); } - virtual ::sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::hasElements(); } - virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::createSubSetEnumerationByQuery(Query); } - virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const ::com::sun::star::uno::Sequence< css::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const ::com::sun::star::uno::Sequence< css::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return BaseContainer::createSubSetEnumerationByProperties(Properties); } }; diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx index 222446dc4e5d..d05fb7df846b 100644 --- a/filter/source/config/cache/lateinitlistener.cxx +++ b/filter/source/config/cache/lateinitlistener.cxx @@ -57,7 +57,7 @@ LateInitListener::~LateInitListener() void SAL_CALL LateInitListener::notifyEvent(const css::document::EventObject& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // wait for events which either // a) indicate completed open of the first document in which case launch thread @@ -101,7 +101,7 @@ void SAL_CALL LateInitListener::notifyEvent(const css::document::EventObject& aE void SAL_CALL LateInitListener::disposing(const css::lang::EventObject& /* aEvent */ ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // ??? // Normaly it should never be called. Because we cancel our listener connection diff --git a/filter/source/config/cache/lateinitlistener.hxx b/filter/source/config/cache/lateinitlistener.hxx index 5c4c55e7b086..a7654baa9de3 100644 --- a/filter/source/config/cache/lateinitlistener.hxx +++ b/filter/source/config/cache/lateinitlistener.hxx @@ -95,12 +95,12 @@ class LateInitListener : public BaseLock // must be the first one to guarantee r // document.XEventListener virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //--------------------------------------- // lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); }; } // namespace config diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index bfa57ee083fe..3cb439077130 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -65,7 +65,7 @@ TypeDetection::~TypeDetection() OUString SAL_CALL TypeDetection::queryTypeByURL(const OUString& sURL) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { OUString sType; @@ -368,7 +368,7 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, sal_Bool bAllowDeep ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // make the descriptor more useable :-) utl::MediaDescriptor stlDescriptor(lDescriptor); diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 62e6719a8bd6..09018d4c7f27 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -327,11 +327,11 @@ public: // XTypeDetection virtual OUString SAL_CALL queryTypeByURL(const OUString& sURL) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, sal_Bool bAllowDeep ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); //------------------------------------------- // static uno helper! diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 5a44f73d9046..32615b9d37a2 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -102,7 +102,7 @@ SWFDialog::~SWFDialog() Any SAL_CALL SWFDialog::queryInterface( const Type& rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Any aReturn = OGenericUnoDialog::queryInterface( rType ); @@ -133,7 +133,7 @@ void SAL_CALL SWFDialog::release() Sequence< sal_Int8 > SAL_CALL SWFDialog::getImplementationId() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return SWFDialog_getImplementationId(); } @@ -141,7 +141,7 @@ Sequence< sal_Int8 > SAL_CALL SWFDialog::getImplementationId() OUString SAL_CALL SWFDialog::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return SWFDialog_getImplementationName(); } @@ -149,7 +149,7 @@ OUString SAL_CALL SWFDialog::getImplementationName() Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return SWFDialog_getSupportedServiceNames(); } @@ -202,7 +202,7 @@ void SWFDialog::executedDialog( sal_Int16 nExecutionResult ) Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo() - throw(RuntimeException) + throw(RuntimeException, std::exception) { Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -225,7 +225,7 @@ Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo() Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { sal_Int32 i, nCount; @@ -247,7 +247,7 @@ Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues() void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rProps ) - throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) + throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { maMediaDescriptor = rProps; @@ -264,7 +264,7 @@ void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr void SAL_CALL SWFDialog::setSourceDocument( const Reference< XComponent >& xDoc ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { mxSrcDoc = xDoc; } diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index b4fe8b47d5e9..e7ff9df17f1b 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -46,28 +46,28 @@ private: protected: // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // OGenericUnoDialog - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception); virtual Dialog* createDialog( Window* pParent ); virtual void executedDialog( sal_Int16 nExecutionResult ); - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // XPropertyAccess using ::cppu::OPropertySetHelper::getPropertyValues; using ::cppu::OPropertySetHelper::setPropertyValues; - virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (com::sun::star::uno::RuntimeException); - 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); + virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > 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, std::exception); // XExporter - virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception); public: diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 55270544f393..5654a69dbe93 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -69,12 +69,12 @@ public: } // stario::XOutputStream - virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); }; -void SAL_CALL OslOutputStreamWrapper::writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OslOutputStreamWrapper::writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_uInt64 uBytesToWrite = aData.getLength(); sal_uInt64 uBytesWritten = 0; @@ -108,11 +108,11 @@ void SAL_CALL OslOutputStreamWrapper::writeBytes( const ::com::sun::star::uno::S } } -void SAL_CALL OslOutputStreamWrapper::flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OslOutputStreamWrapper::flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { } -void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { osl::File::RC eRC = mrFile.close(); @@ -148,23 +148,23 @@ public: FlashExportFilter( const Reference< XComponentContext > &rxContext); // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException); + virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception); sal_Bool ExportAsMultipleFiles( const Sequence< PropertyValue >& aDescriptor ); sal_Bool ExportAsSingleFile( const Sequence< PropertyValue >& aDescriptor ); - virtual void SAL_CALL cancel( ) throw (RuntimeException); + virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception); // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException); + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); }; @@ -221,7 +221,7 @@ TYPE findPropertyValue(const Sequence< PropertyValue >& aPropertySequence, const } sal_Bool SAL_CALL FlashExportFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { mxStatusIndicator = findPropertyValue<Reference<XStatusIndicator> >(aDescriptor, "StatusIndicator", mxStatusIndicator); @@ -428,7 +428,7 @@ sal_Bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& void SAL_CALL FlashExportFilter::cancel( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { } @@ -436,7 +436,7 @@ void SAL_CALL FlashExportFilter::cancel( ) // XExporter void SAL_CALL FlashExportFilter::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) + throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { mxDoc = xDoc; } @@ -445,7 +445,7 @@ void SAL_CALL FlashExportFilter::setSourceDocument( const ::com::sun::star::uno: // XInitialization void SAL_CALL FlashExportFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& /* aArguments */ ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { } @@ -472,19 +472,19 @@ Reference< XInterface > SAL_CALL FlashExportFilter_createInstance( const Referen // XServiceInfo OUString SAL_CALL FlashExportFilter::getImplementationName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return FlashExportFilter_getImplementationName(); } sal_Bool SAL_CALL FlashExportFilter::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } ::com::sun::star::uno::Sequence< OUString > SAL_CALL FlashExportFilter::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return FlashExportFilter_getSupportedServiceNames(); } diff --git a/filter/source/graphic/GraphicExportDialog.cxx b/filter/source/graphic/GraphicExportDialog.cxx index f784636ffbf9..ca98685e20ab 100644 --- a/filter/source/graphic/GraphicExportDialog.cxx +++ b/filter/source/graphic/GraphicExportDialog.cxx @@ -49,11 +49,11 @@ GraphicExportDialog::~GraphicExportDialog() } // XInitialization -void SAL_CALL GraphicExportDialog::initialize( const Sequence<Any>& ) throw ( Exception, RuntimeException ) +void SAL_CALL GraphicExportDialog::initialize( const Sequence<Any>& ) throw ( Exception, RuntimeException, std::exception ) {} // XPropertyAccess -Sequence<PropertyValue> GraphicExportDialog::getPropertyValues() throw ( RuntimeException ) +Sequence<PropertyValue> GraphicExportDialog::getPropertyValues() throw ( RuntimeException, std::exception ) { sal_Int32 i; sal_Int32 nCount = maMediaDescriptor.getLength(); @@ -79,7 +79,7 @@ Sequence<PropertyValue> GraphicExportDialog::getPropertyValues() throw ( Runtime void GraphicExportDialog::setPropertyValues( const Sequence<PropertyValue>& aProps ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, - WrappedTargetException, RuntimeException ) + WrappedTargetException, RuntimeException, std::exception ) { maMediaDescriptor = aProps; @@ -99,12 +99,12 @@ void GraphicExportDialog::setPropertyValues( const Sequence<PropertyValue>& aPro // XExecutableDialog void GraphicExportDialog::setTitle( const OUString& aTitle ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { maDialogTitle = aTitle; } -sal_Int16 GraphicExportDialog::execute() throw ( RuntimeException ) +sal_Int16 GraphicExportDialog::execute() throw ( RuntimeException, std::exception ) { sal_Int16 nReturn = ui::dialogs::ExecutableDialogResults::CANCEL; GraphicExportOptionsDialog graphicExportOptionsDialog( Application::GetDefDialogParent(), mxSourceDocument ); @@ -118,7 +118,7 @@ sal_Int16 GraphicExportDialog::execute() throw ( RuntimeException ) // XEmporter void GraphicExportDialog::setSourceDocument( const Reference<XComponent>& xDocument ) - throw ( IllegalArgumentException, RuntimeException ) + throw ( IllegalArgumentException, RuntimeException, std::exception ) { mxSourceDocument = xDocument; diff --git a/filter/source/graphic/GraphicExportDialog.hxx b/filter/source/graphic/GraphicExportDialog.hxx index 7933f3c07b34..381f43921cf7 100644 --- a/filter/source/graphic/GraphicExportDialog.hxx +++ b/filter/source/graphic/GraphicExportDialog.hxx @@ -57,21 +57,21 @@ public: virtual ~GraphicExportDialog(); // XInitialization - virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw (Exception, RuntimeException ); + virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw (Exception, RuntimeException, std::exception ); // XPropertyAccess - virtual Sequence<PropertyValue> SAL_CALL getPropertyValues() throw ( RuntimeException ); + virtual Sequence<PropertyValue> SAL_CALL getPropertyValues() throw ( RuntimeException, std::exception ); virtual void SAL_CALL setPropertyValues( const Sequence<PropertyValue>& aProps ) throw ( UnknownPropertyException, PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - RuntimeException ); + RuntimeException, std::exception ); // XExecuteDialog - virtual sal_Int16 SAL_CALL execute() throw ( RuntimeException ); - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw ( RuntimeException ); + virtual sal_Int16 SAL_CALL execute() throw ( RuntimeException, std::exception ); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw ( RuntimeException, std::exception ); // XExporter - virtual void SAL_CALL setSourceDocument( const Reference<lang::XComponent>& xDocument ) throw ( lang::IllegalArgumentException, RuntimeException ); + virtual void SAL_CALL setSourceDocument( const Reference<lang::XComponent>& xDocument ) throw ( lang::IllegalArgumentException, RuntimeException, std::exception ); }; diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx index 6cc22f91e2cb..2f4caba5060d 100644 --- a/filter/source/graphic/GraphicExportFilter.cxx +++ b/filter/source/graphic/GraphicExportFilter.cxx @@ -102,7 +102,7 @@ void GraphicExportFilter::gatherProperties( const Sequence<PropertyValue>& rProp } sal_Bool SAL_CALL GraphicExportFilter::filter( const Sequence<PropertyValue>& rDescriptor ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { gatherProperties(rDescriptor); @@ -143,18 +143,18 @@ sal_Bool SAL_CALL GraphicExportFilter::filter( const Sequence<PropertyValue>& rD return false; } -void SAL_CALL GraphicExportFilter::cancel( ) throw (RuntimeException) +void SAL_CALL GraphicExportFilter::cancel( ) throw (RuntimeException, std::exception) { } void SAL_CALL GraphicExportFilter::setSourceDocument( const Reference<XComponent>& xDocument ) - throw (IllegalArgumentException, RuntimeException) + throw (IllegalArgumentException, RuntimeException, std::exception) { mxDocument = xDocument; } void SAL_CALL GraphicExportFilter::initialize( const Sequence<Any>& ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { } diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx index 4c4c7d90300d..39ea4b4b0d10 100644 --- a/filter/source/graphic/GraphicExportFilter.hxx +++ b/filter/source/graphic/GraphicExportFilter.hxx @@ -61,14 +61,14 @@ public: virtual ~GraphicExportFilter(); // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence<PropertyValue>& rDescriptor ) throw(RuntimeException); - virtual void SAL_CALL cancel( ) throw (RuntimeException); + virtual sal_Bool SAL_CALL filter( const Sequence<PropertyValue>& rDescriptor ) throw(RuntimeException, std::exception); + virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception); // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDocument ) throw(IllegalArgumentException, RuntimeException); + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDocument ) throw(IllegalArgumentException, RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw(Exception, RuntimeException, std::exception); }; #endif diff --git a/filter/source/htmlfilterdetect/filterdetect.cxx b/filter/source/htmlfilterdetect/filterdetect.cxx index 9e5350d26fff..5b617c47bf4f 100644 --- a/filter/source/htmlfilterdetect/filterdetect.cxx +++ b/filter/source/htmlfilterdetect/filterdetect.cxx @@ -104,7 +104,7 @@ bool isHTMLStream(const OString& aStreamHeader) } OUString SAL_CALL HtmlFilterDetect::detect(Sequence<PropertyValue>& lDescriptor) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OUString sUrl; OUString sDocService; @@ -186,7 +186,7 @@ OUString SAL_CALL HtmlFilterDetect::detect(Sequence<PropertyValue>& lDescriptor) // XInitialization void SAL_CALL HtmlFilterDetect::initialize(const Sequence<Any>& /*aArguments*/) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { } @@ -212,19 +212,19 @@ Reference<XInterface> HtmlFilterDetect_createInstance(const Reference<XComponent // XServiceInfo OUString SAL_CALL HtmlFilterDetect::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return HtmlFilterDetect_getImplementationName(); } sal_Bool SAL_CALL HtmlFilterDetect::supportsService(const OUString& rServiceName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence<OUString> SAL_CALL HtmlFilterDetect::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return HtmlFilterDetect_getSupportedServiceNames(); } diff --git a/filter/source/htmlfilterdetect/filterdetect.hxx b/filter/source/htmlfilterdetect/filterdetect.hxx index 631d4d3715e5..f8327af28f4e 100644 --- a/filter/source/htmlfilterdetect/filterdetect.hxx +++ b/filter/source/htmlfilterdetect/filterdetect.hxx @@ -33,23 +33,23 @@ public: // XExtendedFilterDetection virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor) - 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); }; OUString HtmlFilterDetect_getImplementationName(); diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 9521f3bb431d..d5051c1a152a 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -537,24 +537,24 @@ VBAMacroResolver::~VBAMacroResolver() // com.sun.star.lang.XServiceInfo interface ----------------------------------- -OUString SAL_CALL VBAMacroResolver::getImplementationName() throw (uno::RuntimeException) +OUString SAL_CALL VBAMacroResolver::getImplementationName() throw (uno::RuntimeException, std::exception) { return VBAMacroResolver_getImplementationName(); } -sal_Bool SAL_CALL VBAMacroResolver::supportsService( const OUString& rService ) throw (uno::RuntimeException) +sal_Bool SAL_CALL VBAMacroResolver::supportsService( const OUString& rService ) throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rService); } -uno::Sequence< OUString > SAL_CALL VBAMacroResolver::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL VBAMacroResolver::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { return VBAMacroResolver_getSupportedServiceNames(); } // com.sun.star.lang.XInitialization interface -------------------------------- -void SAL_CALL VBAMacroResolver::initialize( const uno::Sequence< uno::Any >& rArgs ) throw (uno::Exception, uno::RuntimeException) +void SAL_CALL VBAMacroResolver::initialize( const uno::Sequence< uno::Any >& rArgs ) throw (uno::Exception, uno::RuntimeException, std::exception) { OSL_ENSURE( rArgs.getLength() < 2, "VBAMacroResolver::initialize - missing arguments" ); if( rArgs.getLength() < 2 ) @@ -574,7 +574,7 @@ void SAL_CALL VBAMacroResolver::initialize( const uno::Sequence< uno::Any >& rAr // com.sun.star.script.vba.XVBAMacroResolver interface ------------------------ -OUString SAL_CALL VBAMacroResolver::resolveVBAMacroToScriptURL( const OUString& rVBAMacroName ) throw (lang::IllegalArgumentException, uno::RuntimeException) +OUString SAL_CALL VBAMacroResolver::resolveVBAMacroToScriptURL( const OUString& rVBAMacroName ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if( !mpObjShell ) throw uno::RuntimeException(); @@ -605,7 +605,7 @@ OUString SAL_CALL VBAMacroResolver::resolveVBAMacroToScriptURL( const OUString& return makeMacroURL( aInfo.msResolvedMacro ); } -OUString SAL_CALL VBAMacroResolver::resolveScriptURLtoVBAMacro( const OUString& /*rScriptURL*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) +OUString SAL_CALL VBAMacroResolver::resolveScriptURLtoVBAMacro( const OUString& /*rScriptURL*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { OSL_ENSURE( false, "VBAMacroResolver::resolveScriptURLtoVBAMacro - not implemented" ); throw uno::RuntimeException(); diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index a45aaade3b0f..91abcfe895ed 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -72,7 +72,7 @@ namespace filter { importer(const Sequence< PropertyValue >& sourceData, const Reference< XDocumentHandler >& docHandler, const Sequence< OUString >& userData) - throw (IllegalArgumentException, RuntimeException); + throw (IllegalArgumentException, RuntimeException, std::exception); // XExportFilter virtual sal_Bool SAL_CALL @@ -80,7 +80,7 @@ namespace filter { const Sequence< PropertyValue >& sourceData, const Sequence< OUString >& userData) throw (IllegalArgumentException, - RuntimeException); + RuntimeException, std::exception); // UNO component helper methods @@ -100,7 +100,7 @@ OdfFlatXml::importer( const Sequence< PropertyValue >& sourceData, const Reference< XDocumentHandler >& docHandler, const Sequence< OUString >& /* userData */) - throw (IllegalArgumentException, RuntimeException) + throw (IllegalArgumentException, RuntimeException, std::exception) { // Read InputStream to read from and an URL used for the system id // of the InputSource we create from the given sourceData sequence @@ -146,7 +146,7 @@ OdfFlatXml::importer( sal_Bool OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData, const Sequence< OUString >& /*msUserData*/) - throw (IllegalArgumentException, RuntimeException) + throw (IllegalArgumentException, RuntimeException, std::exception) { OUString paramName; OUString targetURL; diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index cbead17dc2ce..f70911127837 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -96,7 +96,7 @@ PDFDialog::~PDFDialog() Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return PDFDialog_getImplementationId(); } @@ -104,7 +104,7 @@ Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId() OUString SAL_CALL PDFDialog::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return PDFDialog_getImplementationName(); } @@ -112,7 +112,7 @@ OUString SAL_CALL PDFDialog::getImplementationName() Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return PDFDialog_getSupportedServiceNames(); } @@ -144,7 +144,7 @@ void PDFDialog::executedDialog( sal_Int16 nExecutionResult ) Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo() - throw(RuntimeException) + throw(RuntimeException, std::exception) { Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -167,7 +167,7 @@ Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo() Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { sal_Int32 i, nCount; @@ -189,7 +189,7 @@ Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues() void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rProps ) - throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) + throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { maMediaDescriptor = rProps; @@ -206,7 +206,7 @@ void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr void SAL_CALL PDFDialog::setSourceDocument( const Reference< XComponent >& xDoc ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { mxSrcDoc = xDoc; } diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index aff530d1c846..e4243e969eea 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -48,23 +48,23 @@ private: protected: // OGenericUnoDialog - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException); - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception); virtual Dialog* createDialog( Window* pParent ); virtual void executedDialog( sal_Int16 nExecutionResult ); - virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException); + virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // XPropertyAccess using OPropertySetHelper::getPropertyValues; - virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException); + virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception); using OPropertySetHelper::setPropertyValues; - virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException); + virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception); // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException); + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception); public: diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 5b1994bb9af8..25511bb2bd4e 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -956,8 +956,8 @@ public: PDFErrorRequest( const task::PDFExportException& i_rExc ); // XInteractionRequest - virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException); - virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() throw (uno::RuntimeException); + virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception); + virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception); }; PDFErrorRequest::PDFErrorRequest( const task::PDFExportException& i_rExc ) : @@ -966,7 +966,7 @@ PDFErrorRequest::PDFErrorRequest( const task::PDFExportException& i_rExc ) : { } -uno::Any SAL_CALL PDFErrorRequest::getRequest() throw (uno::RuntimeException) +uno::Any SAL_CALL PDFErrorRequest::getRequest() throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -975,7 +975,7 @@ uno::Any SAL_CALL PDFErrorRequest::getRequest() throw (uno::RuntimeException) return aRet; } -uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL PDFErrorRequest::getContinuations() throw (uno::RuntimeException) +uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL PDFErrorRequest::getContinuations() throw (uno::RuntimeException, std::exception) { return uno::Sequence< uno::Reference< task::XInteractionContinuation > >(); } diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 5814b42a5bd3..8302a5eafe00 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -163,7 +163,7 @@ IMPL_LINK( FocusWindowWaitCursor, DestroyedLink, VclWindowEvent*, pEvent ) } sal_Bool SAL_CALL PDFFilter::filter( const Sequence< PropertyValue >& rDescriptor ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { FocusWindowWaitCursor aCur; @@ -174,14 +174,14 @@ sal_Bool SAL_CALL PDFFilter::filter( const Sequence< PropertyValue >& rDescripto -void SAL_CALL PDFFilter::cancel( ) throw (RuntimeException) +void SAL_CALL PDFFilter::cancel( ) throw (RuntimeException, std::exception) { } void SAL_CALL PDFFilter::setSourceDocument( const Reference< XComponent >& xDoc ) - throw (IllegalArgumentException, RuntimeException) + throw (IllegalArgumentException, RuntimeException, std::exception) { mxSrcDoc = xDoc; } @@ -189,7 +189,7 @@ void SAL_CALL PDFFilter::setSourceDocument( const Reference< XComponent >& xDoc void SAL_CALL PDFFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { } @@ -215,7 +215,7 @@ Reference< XInterface > SAL_CALL PDFFilter_createInstance( const Reference< XMul OUString SAL_CALL PDFFilter::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return PDFFilter_getImplementationName(); } @@ -223,14 +223,14 @@ OUString SAL_CALL PDFFilter::getImplementationName() sal_Bool SAL_CALL PDFFilter::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL PDFFilter::getSupportedServiceNames( ) throw (RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL PDFFilter::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return PDFFilter_getSupportedServiceNames(); } diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index 31741883d006..9eb8dedaefbd 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -71,19 +71,19 @@ private: protected: // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException); - virtual void SAL_CALL cancel( ) throw (RuntimeException); + virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception); + virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception); // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException); + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); public: diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx index 13b3cd50d46e..5f16d50323e1 100644 --- a/filter/source/pdf/pdfinteract.cxx +++ b/filter/source/pdf/pdfinteract.cxx @@ -35,13 +35,13 @@ PDFInteractionHandler::~PDFInteractionHandler() } void SAL_CALL PDFInteractionHandler::handle( const Reference< task::XInteractionRequest >& i_xRequest ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { handleInteractionRequest( i_xRequest ); } sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Reference< task::XInteractionRequest >& i_xRequest ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Bool bHandled = sal_False; @@ -80,18 +80,18 @@ Reference< XInterface > SAL_CALL PDFInteractionHandler_createInstance( const Ref } OUString SAL_CALL PDFInteractionHandler::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return PDFInteractionHandler_getImplementationName(); } sal_Bool SAL_CALL PDFInteractionHandler::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL PDFInteractionHandler::getSupportedServiceNames( ) throw (RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL PDFInteractionHandler::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return PDFInteractionHandler_getSupportedServiceNames(); } diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx index f26e2559deb5..070cab0b1599 100644 --- a/filter/source/pdf/pdfinteract.hxx +++ b/filter/source/pdf/pdfinteract.hxx @@ -39,15 +39,15 @@ class PDFInteractionHandler : public cppu::WeakImplHelper2 < task::XInteractionH { protected: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); // XIniteractionHandler - virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& ) throw(RuntimeException); + virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception); // XIniteractionHandler2 - virtual sal_Bool SAL_CALL handleInteractionRequest( const Reference< task::XInteractionRequest >& ) throw(RuntimeException); + virtual sal_Bool SAL_CALL handleInteractionRequest( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception); public: PDFInteractionHandler(); diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index 2a82b1fdee89..02d4a9809053 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -54,19 +54,19 @@ public: PlaceWareExportFilter( const Reference< XComponentContext > &rxContext); // XFilter - 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); // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException); + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); }; @@ -79,7 +79,7 @@ PlaceWareExportFilter::PlaceWareExportFilter(const Reference< XComponentContext sal_Bool SAL_CALL PlaceWareExportFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int32 nLength = aDescriptor.getLength(); const PropertyValue * pValue = aDescriptor.getConstArray(); @@ -119,7 +119,7 @@ sal_Bool SAL_CALL PlaceWareExportFilter::filter( const ::com::sun::star::uno::Se void SAL_CALL PlaceWareExportFilter::cancel( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { } @@ -127,7 +127,7 @@ void SAL_CALL PlaceWareExportFilter::cancel( ) // XExporter void SAL_CALL PlaceWareExportFilter::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) + throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { mxDoc = xDoc; } @@ -136,7 +136,7 @@ void SAL_CALL PlaceWareExportFilter::setSourceDocument( const ::com::sun::star:: // XInitialization void SAL_CALL PlaceWareExportFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& /* aArguments */ ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { } @@ -163,19 +163,19 @@ Reference< XInterface > SAL_CALL PlaceWareExportFilter_createInstance( const Ref // XServiceInfo OUString SAL_CALL PlaceWareExportFilter::getImplementationName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return PlaceWareExportFilter_getImplementationName(); } sal_Bool SAL_CALL PlaceWareExportFilter::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } ::com::sun::star::uno::Sequence< OUString > SAL_CALL PlaceWareExportFilter::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return PlaceWareExportFilter_getSupportedServiceNames(); } diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index 9ae45d865d20..9dc9bd4efa28 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -100,7 +100,7 @@ SVGDialog::~SVGDialog() Any SAL_CALL SVGDialog::queryInterface( const Type& rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Any aReturn( OGenericUnoDialog::queryInterface( rType ) ); @@ -132,7 +132,7 @@ void SAL_CALL SVGDialog::release() Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return SVGDialog_getImplementationId(); } @@ -140,7 +140,7 @@ Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId() OUString SAL_CALL SVGDialog::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return SVGDialog_getImplementationName(); } @@ -148,7 +148,7 @@ OUString SAL_CALL SVGDialog::getImplementationName() Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return SVGDialog_getSupportedServiceNames(); } @@ -175,7 +175,7 @@ void SVGDialog::executedDialog( sal_Int16 nExecutionResult ) Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return( Reference< XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ) ); } @@ -199,7 +199,7 @@ Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo() Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { sal_Int32 i, nCount; @@ -223,7 +223,7 @@ Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues() void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rProps ) - throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) + throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { maMediaDescriptor = rProps; @@ -240,7 +240,7 @@ void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rPr void SAL_CALL SVGDialog::setSourceDocument( const Reference< XComponent >& xDoc ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { mxSrcDoc = xDoc; } diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index c426065ead46..8e8f59c3723f 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -47,28 +47,28 @@ private: protected: // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // OGenericUnoDialog - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception); virtual Dialog* createDialog( Window* pParent ); virtual void executedDialog( sal_Int16 nExecutionResult ); - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // XPropertyAccess using cppu::OPropertySetHelper::getPropertyValues; - virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (com::sun::star::uno::RuntimeException, std::exception); using cppu::OPropertySetHelper::setPropertyValues; - 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); + 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, std::exception); // XExporter - virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception); public: diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index e8e7df608e8a..ce6d93edf0a1 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -80,7 +80,7 @@ SVGFilter::~SVGFilter() sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescriptor ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; Window* pFocusWindow = Application::GetFocusWindow(); @@ -244,14 +244,14 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto -void SAL_CALL SVGFilter::cancel( ) throw (RuntimeException) +void SAL_CALL SVGFilter::cancel( ) throw (RuntimeException, std::exception) { } void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc ) - throw (IllegalArgumentException, RuntimeException) + throw (IllegalArgumentException, RuntimeException, std::exception) { mxSrcDoc = xDoc; } @@ -259,14 +259,14 @@ void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) + throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { mxDstDoc = xDoc; } -OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException) +OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException, std::exception) { uno::Reference< io::XInputStream > xInput; diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 9c5a0587c343..7dfbb7767e66 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -312,17 +312,17 @@ private: protected: // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException); - virtual void SAL_CALL cancel( ) throw (RuntimeException); + virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) 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); + virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception); // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException); + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception); // XExtendedFilterDetection - virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException); + virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException, std::exception); public: diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index a124abf2d726..ec7d5e186229 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -3632,7 +3632,7 @@ SVGWriter::~SVGWriter() void SAL_CALL SVGWriter::write( const Reference<XDocumentHandler>& rxDocHandler, - const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException ) + const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception ) { SvMemoryStream aMemStm( (char*) rMtfSeq.getConstArray(), rMtfSeq.getLength(), STREAM_READ ); GDIMetaFile aMtf; diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 85ec20ecd73e..a5ac3092f0b0 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -416,7 +416,7 @@ public: // XSVGWriter virtual void SAL_CALL write( const Reference<XDocumentHandler>& rxDocHandler, - const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException ); + const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception ); }; #endif diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx index b49f82b78893..6d16a35d7852 100644 --- a/filter/source/svg/test/odfserializer.cxx +++ b/filter/source/svg/test/odfserializer.cxx @@ -47,14 +47,14 @@ public: m_aLineFeed[0] = '\n'; } - virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); + virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); + virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); + virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); + virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); + virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); private: uno::Reference<io::XOutputStream> m_xOutStream; @@ -62,7 +62,7 @@ private: uno::Sequence<sal_Int8> m_aBuf; }; -void SAL_CALL ODFSerializer::startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { OSL_PRECOND(m_xOutStream.is(), "ODFSerializer(): invalid output stream"); @@ -71,11 +71,11 @@ void SAL_CALL ODFSerializer::startDocument( ) throw (xml::sax::SAXException, un characters(aElement.makeStringAndClear()); } -void SAL_CALL ODFSerializer::endDocument() throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::endDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception) {} void SAL_CALL ODFSerializer::startElement( const OUString& aName, - const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) + const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { OUStringBuffer aElement("<" + aName + " "); @@ -87,12 +87,12 @@ void SAL_CALL ODFSerializer::startElement( const OUString& aName, characters(aElement.makeStringAndClear() + ">"); } -void SAL_CALL ODFSerializer::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { characters("</" + aName + ">"); } -void SAL_CALL ODFSerializer::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { const OString aStr = OUStringToOString(aChars, RTL_TEXTENCODING_UTF8); @@ -106,17 +106,17 @@ void SAL_CALL ODFSerializer::characters( const OUString& aChars ) throw (xml::sa m_xOutStream->writeBytes(m_aLineFeed); } -void SAL_CALL ODFSerializer::ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { // TODO(F1): Make pretty printing configurable characters(aWhitespaces); } void SAL_CALL ODFSerializer::processingInstruction( const OUString&, - const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) + const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) {} -void SAL_CALL ODFSerializer::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) {} uno::Reference< xml::sax::XDocumentHandler> createSerializer(const uno::Reference<io::XOutputStream>& xOut ) diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx index 1aaf4e118ba9..33b308c5aebf 100644 --- a/filter/source/svg/test/svg2odf.cxx +++ b/filter/source/svg/test/svg2odf.cxx @@ -46,18 +46,18 @@ namespace maFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write ); } - virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException) + virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) { sal_uInt64 nBytesWritten(0); maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten); } - virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException) + virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) { } - virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException) + virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) { maFile.close(); } diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 213d3c1a74f5..1d9550dcc856 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -140,7 +140,7 @@ T602ImportFilter::~T602ImportFilter() // XExtendedTypeDetection OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor) - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Int32 nLength = Descriptor.getLength(); const PropertyValue * pValue = Descriptor.getConstArray(); @@ -168,21 +168,21 @@ OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor) // XFilter sal_Bool SAL_CALL T602ImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return importImpl ( aDescriptor ); } // XImporter void SAL_CALL T602ImportFilter::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) { mxDoc = xDoc; } // XInitialization void SAL_CALL T602ImportFilter::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { Sequence < PropertyValue > aAnySeq; sal_Int32 nLength = aArguments.getLength(); @@ -842,19 +842,19 @@ void T602ImportFilter::Read602() // XServiceInfo OUString SAL_CALL T602ImportFilter::getImplementationName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return T602ImportFilter_getImplementationName(); } sal_Bool SAL_CALL T602ImportFilter::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL T602ImportFilter::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return T602ImportFilter_getSupportedServiceNames(); } @@ -893,14 +893,14 @@ T602ImportFilterDialog::~T602ImportFilterDialog() // XLocalizable void SAL_CALL T602ImportFilterDialog::setLocale( const Locale& eLocale ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { meLocale = eLocale; initLocale(); } Locale SAL_CALL T602ImportFilterDialog::getLocale() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return meLocale; } @@ -1102,12 +1102,12 @@ ResMgr* T602ImportFilterDialog::getResMgr() } void SAL_CALL T602ImportFilterDialog::setTitle( const OUString& ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { } sal_Int16 SAL_CALL T602ImportFilterDialog::execute() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if (OptionsDlg()) return com::sun::star::ui::dialogs::ExecutableDialogResults::OK; @@ -1121,33 +1121,33 @@ OUString T602ImportFilterDialog::getResStr( sal_Int16 resid ) return sStr; } -uno::Sequence<beans::PropertyValue> SAL_CALL T602ImportFilterDialog::getPropertyValues() throw(uno::RuntimeException) +uno::Sequence<beans::PropertyValue> SAL_CALL T602ImportFilterDialog::getPropertyValues() throw(uno::RuntimeException, std::exception) { return uno::Sequence<beans::PropertyValue>(); } void SAL_CALL T602ImportFilterDialog::setPropertyValues( const uno::Sequence<beans::PropertyValue>& ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } // XServiceInfo OUString SAL_CALL T602ImportFilterDialog::getImplementationName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return T602ImportFilterDialog_getImplementationName(); } sal_Bool SAL_CALL T602ImportFilterDialog::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL T602ImportFilterDialog::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return T602ImportFilterDialog_getSupportedServiceNames(); } diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index d31a78b766f9..3c6640db6d1e 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -108,34 +108,34 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper4 < // 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); // XLocalizable virtual void SAL_CALL setLocale( const com::sun::star::lang::Locale& eLocale ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::lang::Locale SAL_CALL getLocale() - 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: T602ImportFilterDialog(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r ); @@ -221,30 +221,30 @@ private: // 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); // XExtendedTypeDetection 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); }; OUString T602ImportFilter_getImplementationName() diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index affcf340a0dd..aea331f9140a 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -44,7 +44,7 @@ PlainTextFilterDetect::PlainTextFilterDetect(const uno::Reference<uno::XComponen PlainTextFilterDetect::~PlainTextFilterDetect() {} -OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyValue>& lDescriptor) throw (uno::RuntimeException) +OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyValue>& lDescriptor) throw (uno::RuntimeException, std::exception) { OUString aType; OUString aDocService; @@ -110,7 +110,7 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyVal // XInitialization void SAL_CALL PlainTextFilterDetect::initialize(const uno::Sequence<uno::Any>& /*aArguments*/) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { } @@ -136,19 +136,19 @@ uno::Reference<uno::XInterface> PlainTextFilterDetect_createInstance( // XServiceInfo OUString SAL_CALL PlainTextFilterDetect::getImplementationName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return PlainTextFilterDetect_getImplementationName(); } sal_Bool SAL_CALL PlainTextFilterDetect::supportsService(const OUString& rServiceName) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL PlainTextFilterDetect::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return PlainTextFilterDetect_getSupportedServiceNames(); } diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx index 97f66b582123..310fbfe5603d 100644 --- a/filter/source/textfilterdetect/filterdetect.hxx +++ b/filter/source/textfilterdetect/filterdetect.hxx @@ -42,23 +42,23 @@ public: // XExtendedFilterDetection virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor) - 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); }; OUString PlainTextFilterDetect_getImplementationName(); diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 465cdcc3f0bd..328f215e959f 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -310,17 +310,17 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star } sal_Bool SAL_CALL XmlFilterAdaptor::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return meType == FILTER_EXPORT ? exportImpl ( aDescriptor ) : importImpl ( aDescriptor ); } void SAL_CALL XmlFilterAdaptor::cancel( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { } // XExporter void SAL_CALL XmlFilterAdaptor::setSourceDocument( const 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_EXPORT; mxDoc = xDoc; @@ -328,14 +328,14 @@ void SAL_CALL XmlFilterAdaptor::setSourceDocument( const Reference< ::com::sun:: // XImporter void SAL_CALL XmlFilterAdaptor::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) { meType = FILTER_IMPORT; mxDoc = xDoc; } // XInitialization void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { Sequence < PropertyValue > aAnySeq; sal_Int32 nLength = aArguments.getLength(); @@ -374,19 +374,19 @@ Reference< XInterface > SAL_CALL XmlFilterAdaptor_createInstance( const Referenc // XServiceInfo OUString SAL_CALL XmlFilterAdaptor::getImplementationName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return XmlFilterAdaptor_getImplementationName(); } sal_Bool SAL_CALL XmlFilterAdaptor::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL XmlFilterAdaptor::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return XmlFilterAdaptor_getSupportedServiceNames(); } diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index d5d4c5a6f9f0..557d87f6d112 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -85,17 +85,17 @@ 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); // XExporter virtual void SAL_CALL setSourceDocument( 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); @@ -103,7 +103,7 @@ public: 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); @@ -111,7 +111,7 @@ public: 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); @@ -119,15 +119,15 @@ public: 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/filter/source/xmlfilteradaptor/streamwrap.cxx b/filter/source/xmlfilteradaptor/streamwrap.cxx index 3f42cbda43f0..8e1266612283 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.cxx +++ b/filter/source/xmlfilteradaptor/streamwrap.cxx @@ -33,7 +33,7 @@ using namespace ::osl; //= OOutputStreamWrapper //================================================================== -void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) +void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { sal_uInt64 nWritten = 0; rStream.write(aData.getConstArray(),aData.getLength(),nWritten); @@ -44,12 +44,12 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 } -void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) +void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { } -void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) +void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { } diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx index 1642845421d6..62e7ceaf02ba 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.hxx +++ b/filter/source/xmlfilteradaptor/streamwrap.hxx @@ -48,9 +48,9 @@ public: OOutputStreamWrapper(::osl::File& _rStream) :rStream(_rStream) { } // stario::XOutputStream - virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); - virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); - virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); + virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); + virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); + virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); }; } // namespace utl diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index c14663a62a00..0b2491452ee8 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -91,7 +91,7 @@ OUString supportedByType( const OUString clipBoardFormat , const OUString resul } -OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aArguments ) throw( com::sun::star::uno::RuntimeException ) +OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aArguments ) throw( com::sun::star::uno::RuntimeException, std::exception ) { OUString sTypeName; OUString sUrl; @@ -211,7 +211,7 @@ OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun: // XInitialization void SAL_CALL FilterDetect::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { Sequence < PropertyValue > aAnySeq; sal_Int32 nLength = aArguments.getLength(); @@ -264,18 +264,18 @@ Reference< XInterface > FilterDetect_createInstance( const Reference< XComponent // XServiceInfo OUString SAL_CALL FilterDetect::getImplementationName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return FilterDetect_getImplementationName(); } sal_Bool SAL_CALL FilterDetect::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL FilterDetect::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return FilterDetect_getSupportedServiceNames(); } diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx index 0791c7360e21..bdda6b9d5832 100644 --- a/filter/source/xmlfilterdetect/filterdetect.hxx +++ b/filter/source/xmlfilterdetect/filterdetect.hxx @@ -72,21 +72,21 @@ public: //XExtendedFilterDetection virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); }; OUString SAL_CALL FilterDetect_getImplementationName(); diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index 824a7acb5a92..89c0761a59d8 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -221,17 +221,17 @@ filter_info_impl* TypeDetectionImporter::createFilterForNode( Node * pNode ) } void SAL_CALL TypeDetectionImporter::startDocument( ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL TypeDetectionImporter::endDocument( ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { ImportState eNewState = e_Unknown; @@ -288,7 +288,7 @@ void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName, const maStack.push( eNewState ); } void SAL_CALL TypeDetectionImporter::endElement( const OUString& /* aName */ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { if( !maStack.empty() ) { @@ -324,7 +324,7 @@ void SAL_CALL TypeDetectionImporter::endElement( const OUString& /* aName */ ) } } void SAL_CALL TypeDetectionImporter::characters( const OUString& aChars ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { if( !maStack.empty() && maStack.top() == e_Value ) { @@ -332,15 +332,15 @@ void SAL_CALL TypeDetectionImporter::characters( const OUString& aChars ) } } void SAL_CALL TypeDetectionImporter::ignorableWhitespace( const OUString& /* aWhitespaces */ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL TypeDetectionImporter::processingInstruction( const OUString& /* aTarget */, const OUString& /* aData */ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL TypeDetectionImporter::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /* xLocator */ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index 273df2b68c90..85b753ef64e6 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -67,21 +67,21 @@ public: static void doImport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xOS, XMLFilterVector& rFilters ); virtual void SAL_CALL startDocument( ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endDocument( ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endElement( const OUString& aName ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL characters( const OUString& aChars ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); private: void fillFilterVector( XMLFilterVector& rFilters ); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 31c1816894fa..d1a37fd05151 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -74,31 +74,31 @@ public: protected: // XInterface - virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException); - virtual Any SAL_CALL queryAggregation( Type const & rType ) throw (RuntimeException); + virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL queryAggregation( Type const & rType ) throw (RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XTypeProvider - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException); - virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException); + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception); + virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception); // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException); - virtual sal_Int16 SAL_CALL execute( ) throw(RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL execute( ) throw(RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception); // XTerminateListener - virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException); - virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException); - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException); + virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception); + virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception); /** Called in dispose method after the listeners were notified. */ @@ -142,14 +142,14 @@ XMLFilterDialogComponent::~XMLFilterDialogComponent() // XInterface -Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw (RuntimeException) +Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) { return OComponentHelper::queryInterface( aType ); } -Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) throw (RuntimeException) +Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) { if (rType == ::getCppuType( (Reference< ::com::sun::star::ui::dialogs::XExecutableDialog > const *)0 )) { @@ -207,14 +207,14 @@ Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const return (OWeakObject*)new XMLFilterDialogComponent( comphelper::getComponentContext(rSMgr) ); } -OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(com::sun::star::uno::RuntimeException) +OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) { return XMLFilterDialogComponent_getImplementationName(); } namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; } -Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId( void ) throw( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId( void ) throw( RuntimeException, std::exception ) { ::cppu::OImplementationId &rID = lcl_ImplId::get(); return rID.getImplementationId(); @@ -247,17 +247,17 @@ namespace struct theDialogComponentTypes : rtl::Static<DialogComponentTypes, theDialogComponentTypes> {}; } -Sequence< Type > XMLFilterDialogComponent::getTypes() throw (RuntimeException) +Sequence< Type > XMLFilterDialogComponent::getTypes() throw (RuntimeException, std::exception) { return theDialogComponentTypes::get().getTypeCollection().getTypes(); } -Sequence< OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException) +Sequence< OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) { return XMLFilterDialogComponent_getSupportedServiceNames(); } -sal_Bool SAL_CALL XMLFilterDialogComponent::supportsService(const OUString& ServiceName) throw(RuntimeException) +sal_Bool SAL_CALL XMLFilterDialogComponent::supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } @@ -284,7 +284,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing() // XTerminateListener -void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* Event */ ) throw (TerminationVetoException, RuntimeException) +void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* Event */ ) throw (TerminationVetoException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -305,23 +305,23 @@ void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* -void SAL_CALL XMLFilterDialogComponent::notifyTermination( const EventObject& /* Event */ ) throw (RuntimeException) +void SAL_CALL XMLFilterDialogComponent::notifyTermination( const EventObject& /* Event */ ) throw (RuntimeException, std::exception) { // we are going down, so dispose us! dispose(); } -void SAL_CALL XMLFilterDialogComponent::disposing( const EventObject& /* Source */ ) throw (RuntimeException) +void SAL_CALL XMLFilterDialogComponent::disposing( const EventObject& /* Source */ ) throw (RuntimeException, std::exception) { } -void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle */ ) throw(RuntimeException) +void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle */ ) throw(RuntimeException, std::exception) { } -sal_Int16 SAL_CALL XMLFilterDialogComponent::execute( ) throw(RuntimeException) +sal_Int16 SAL_CALL XMLFilterDialogComponent::execute( ) throw(RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -350,7 +350,7 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute( ) throw(RuntimeException) } -void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) +void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) { const Any* pArguments = aArguments.getConstArray(); for(sal_Int32 i=0; i<aArguments.getLength(); ++i, ++pArguments) diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 0577d505643f..d66f05ec8f6d 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -74,10 +74,10 @@ public: GlobalEventListenerImpl( XMLFilterTestDialog* pDialog ); // XEventListener - virtual void SAL_CALL notifyEvent( const com::sun::star::document::EventObject& Event ) throw (RuntimeException); + virtual void SAL_CALL notifyEvent( const com::sun::star::document::EventObject& Event ) throw (RuntimeException, std::exception); // lang::XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw (RuntimeException); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception); private: XMLFilterTestDialog* mpDialog; }; @@ -87,7 +87,7 @@ GlobalEventListenerImpl::GlobalEventListenerImpl( XMLFilterTestDialog* pDialog ) { } -void SAL_CALL GlobalEventListenerImpl::notifyEvent( const com::sun::star::document::EventObject& Event ) throw (RuntimeException) +void SAL_CALL GlobalEventListenerImpl::notifyEvent( const com::sun::star::document::EventObject& Event ) throw (RuntimeException, std::exception) { ::SolarMutexGuard aGuard; if( Event.EventName == "OnFocus" || Event.EventName == "OnUnload" ) @@ -97,7 +97,7 @@ void SAL_CALL GlobalEventListenerImpl::notifyEvent( const com::sun::star::docume } } -void SAL_CALL GlobalEventListenerImpl::disposing( const com::sun::star::lang::EventObject& /* Source */ ) throw (RuntimeException) +void SAL_CALL GlobalEventListenerImpl::disposing( const com::sun::star::lang::EventObject& /* Source */ ) throw (RuntimeException, std::exception) { } diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index c0abb8831323..f02c916c4a83 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -376,13 +376,13 @@ namespace XSLT void LibXSLTTransformer::setInputStream( const css::uno::Reference<XInputStream>& inputStream) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_rInputStream = inputStream; } css::uno::Reference<XInputStream> - LibXSLTTransformer::getInputStream() throw (RuntimeException) + LibXSLTTransformer::getInputStream() throw (RuntimeException, std::exception) { return m_rInputStream; } @@ -390,20 +390,20 @@ namespace XSLT void LibXSLTTransformer::setOutputStream( const css::uno::Reference<XOutputStream>& outputStream) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_rOutputStream = outputStream; } css::uno::Reference<XOutputStream> - LibXSLTTransformer::getOutputStream() throw (RuntimeException) + LibXSLTTransformer::getOutputStream() throw (RuntimeException, std::exception) { return m_rOutputStream; } void LibXSLTTransformer::addListener(const css::uno::Reference<XStreamListener>& listener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_listeners.insert(m_listeners.begin(), listener); } @@ -411,13 +411,13 @@ namespace XSLT void LibXSLTTransformer::removeListener( const css::uno::Reference<XStreamListener>& listener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_listeners.remove(listener); } void - LibXSLTTransformer::start() throw (RuntimeException) + LibXSLTTransformer::start() throw (RuntimeException, std::exception) { ListenerList::iterator it; ListenerList* l = &m_listeners; @@ -462,7 +462,7 @@ namespace XSLT } void - LibXSLTTransformer::terminate() throw (RuntimeException) + LibXSLTTransformer::terminate() throw (RuntimeException, std::exception) { if (m_Reader.is()) { @@ -475,7 +475,7 @@ namespace XSLT void LibXSLTTransformer::initialize(const Sequence<Any>& args) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Sequence<Any> params; args[0] >>= params; diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx index 87d068f7353e..b15f705ca1f8 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.hxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx @@ -109,28 +109,28 @@ namespace XSLT // XActiveDataSink virtual void SAL_CALL setInputStream(const com::sun::star::uno::Reference<XInputStream>& inputStream) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual com::sun::star::uno::Reference<XInputStream> SAL_CALL - getInputStream() throw (RuntimeException); + getInputStream() throw (RuntimeException, std::exception); // XActiveDataSource virtual void SAL_CALL setOutputStream(const com::sun::star::uno::Reference<XOutputStream>& outputStream) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual com::sun::star::uno::Reference<XOutputStream> SAL_CALL - getOutputStream() throw (RuntimeException); + getOutputStream() throw (RuntimeException, std::exception); // XActiveDataControl virtual void SAL_CALL addListener(const com::sun::star::uno::Reference<XStreamListener>& listener) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL removeListener(const com::sun::star::uno::Reference<XStreamListener>& listener) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL - start() throw (RuntimeException); + start() throw (RuntimeException, std::exception); virtual void SAL_CALL - terminate() throw (RuntimeException); + terminate() throw (RuntimeException, std::exception); virtual void SAL_CALL - initialize(const Sequence<Any>& params) throw (RuntimeException); + initialize(const Sequence<Any>& params) throw (RuntimeException, std::exception); void SAL_CALL done(); diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 355b9f0fe7b5..176d1bde5a1d 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -135,32 +135,32 @@ namespace XSLT // XStreamListener virtual void SAL_CALL - error(const Any& a) throw (RuntimeException); + error(const Any& a) throw (RuntimeException, std::exception); virtual void SAL_CALL - closed() throw (RuntimeException); + closed() throw (RuntimeException, std::exception); virtual void SAL_CALL - terminated() throw (RuntimeException); + terminated() throw (RuntimeException, std::exception); virtual void SAL_CALL - started() throw (RuntimeException); + started() throw (RuntimeException, std::exception); virtual void SAL_CALL - disposing(const EventObject& e) throw (RuntimeException); + disposing(const EventObject& e) throw (RuntimeException, std::exception); // XImportFilter virtual sal_Bool SAL_CALL importer(const Sequence<PropertyValue>& aSourceData, const css::uno::Reference< XDocumentHandler>& xHandler, - const Sequence<OUString>& msUserData) throw (RuntimeException); + const Sequence<OUString>& msUserData) throw (RuntimeException, std::exception); // XExportFilter virtual sal_Bool SAL_CALL exporter(const Sequence<PropertyValue>& aSourceData, const Sequence< - OUString>& msUserData) throw (RuntimeException); + OUString>& msUserData) throw (RuntimeException, std::exception); // XDocumentHandler virtual void SAL_CALL - startDocument() throw (SAXException, RuntimeException); + startDocument() throw (SAXException, RuntimeException, std::exception); virtual void SAL_CALL - endDocument() throw (SAXException, RuntimeException); + endDocument() throw (SAXException, RuntimeException, std::exception); }; XSLTFilter::XSLTFilter(const css::uno::Reference<XComponentContext> &r): @@ -175,7 +175,7 @@ namespace XSLT } void - XSLTFilter::disposing(const EventObject&) throw (RuntimeException) + XSLTFilter::disposing(const EventObject&) throw (RuntimeException, std::exception) { } @@ -234,12 +234,12 @@ namespace XSLT } void - XSLTFilter::started() throw (RuntimeException) + XSLTFilter::started() throw (RuntimeException, std::exception) { osl_resetCondition(m_cTransformed); } void - XSLTFilter::error(const Any& a) throw (RuntimeException) + XSLTFilter::error(const Any& a) throw (RuntimeException, std::exception) { Exception e; if (a >>= e) @@ -250,12 +250,12 @@ namespace XSLT osl_setCondition(m_cTransformed); } void - XSLTFilter::closed() throw (RuntimeException) + XSLTFilter::closed() throw (RuntimeException, std::exception) { osl_setCondition(m_cTransformed); } void - XSLTFilter::terminated() throw (RuntimeException) + XSLTFilter::terminated() throw (RuntimeException, std::exception) { m_bTerminated = sal_True; osl_setCondition(m_cTransformed); @@ -279,7 +279,7 @@ namespace XSLT sal_Bool XSLTFilter::importer(const Sequence<PropertyValue>& aSourceData, const css::uno::Reference<XDocumentHandler>& xHandler, const Sequence< - OUString>& msUserData) throw (RuntimeException) + OUString>& msUserData) throw (RuntimeException, std::exception) { if (msUserData.getLength() < 5) return sal_False; @@ -420,7 +420,7 @@ namespace XSLT sal_Bool XSLTFilter::exporter(const Sequence<PropertyValue>& aSourceData, - const Sequence<OUString>& msUserData) throw (RuntimeException) + const Sequence<OUString>& msUserData) throw (RuntimeException, std::exception) { if (msUserData.getLength() < 6) return sal_False; @@ -520,14 +520,14 @@ namespace XSLT // events to the XML writer that we created upon the output stream // that was provided by the XMLFilterAdapter void - XSLTFilter::startDocument() throw (SAXException, RuntimeException) + XSLTFilter::startDocument() throw (SAXException, RuntimeException, std::exception) { ExtendedDocumentHandlerAdapter::startDocument(); m_tcontrol->start(); } void - XSLTFilter::endDocument() throw (SAXException, RuntimeException) + XSLTFilter::endDocument() throw (SAXException, RuntimeException, std::exception) { ExtendedDocumentHandlerAdapter::endDocument(); // wait for the transformer to finish |