diff options
Diffstat (limited to 'filter/source/config/cache')
| -rw-r--r-- | filter/source/config/cache/basecontainer.cxx | 27 | ||||
| -rw-r--r-- | filter/source/config/cache/basecontainer.hxx | 61 | ||||
| -rw-r--r-- | filter/source/config/cache/cacheupdatelistener.cxx | 2 | ||||
| -rw-r--r-- | filter/source/config/cache/cacheupdatelistener.hxx | 6 | ||||
| -rw-r--r-- | filter/source/config/cache/configflush.cxx | 6 | ||||
| -rw-r--r-- | filter/source/config/cache/configflush.hxx | 18 | ||||
| -rw-r--r-- | filter/source/config/cache/contenthandlerfactory.cxx | 5 | ||||
| -rw-r--r-- | filter/source/config/cache/contenthandlerfactory.hxx | 25 | ||||
| -rw-r--r-- | filter/source/config/cache/filtercache.cxx | 27 | ||||
| -rw-r--r-- | filter/source/config/cache/filtercache.hxx | 81 | ||||
| -rw-r--r-- | filter/source/config/cache/filterfactory.cxx | 6 | ||||
| -rw-r--r-- | filter/source/config/cache/filterfactory.hxx | 14 | ||||
| -rw-r--r-- | filter/source/config/cache/frameloaderfactory.cxx | 5 | ||||
| -rw-r--r-- | filter/source/config/cache/frameloaderfactory.hxx | 25 | ||||
| -rw-r--r-- | filter/source/config/cache/typedetection.cxx | 3 | ||||
| -rw-r--r-- | filter/source/config/cache/typedetection.hxx | 9 |
16 files changed, 79 insertions, 241 deletions
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 1869e75cb82b..ec73aaaf1a35 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -102,7 +102,6 @@ void BaseContainer::impl_loadOnDemand() void BaseContainer::impl_initFlushMode() - throw (css::uno::RuntimeException) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -128,20 +127,17 @@ FilterCache* BaseContainer::impl_getWorkingCache() const OUString SAL_CALL BaseContainer::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return m_sImplementationName; } sal_Bool SAL_CALL BaseContainer::supportsService(const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence< OUString > SAL_CALL BaseContainer::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return m_lServiceNames; } @@ -149,10 +145,6 @@ css::uno::Sequence< OUString > SAL_CALL BaseContainer::getSupportedServiceNames( void SAL_CALL BaseContainer::insertByName(const OUString& sItem , const css::uno::Any& aValue) - throw (css::lang::IllegalArgumentException , - css::container::ElementExistException, - css::lang::WrappedTargetException , - css::uno::RuntimeException, std::exception ) { if (sItem.isEmpty()) throw css::lang::IllegalArgumentException("empty value not allowed as item name.", @@ -188,9 +180,6 @@ 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, std::exception ) { impl_loadOnDemand(); @@ -210,10 +199,6 @@ void SAL_CALL BaseContainer::removeByName(const OUString& sItem) void SAL_CALL BaseContainer::replaceByName(const OUString& sItem , const css::uno::Any& aValue) - throw (css::lang::IllegalArgumentException , - css::container::NoSuchElementException, - css::lang::WrappedTargetException , - css::uno::RuntimeException, std::exception ) { if (sItem.isEmpty()) throw css::lang::IllegalArgumentException("empty value not allowed as item name.", @@ -249,9 +234,6 @@ 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, std::exception ) { if (sItem.isEmpty()) throw css::container::NoSuchElementException( "An empty item can't be part of this cache!", @@ -289,7 +271,6 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem) css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > lNames; @@ -317,7 +298,6 @@ css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames() sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem) - throw (css::uno::RuntimeException, std::exception) { bool bHasOne = false; @@ -344,7 +324,6 @@ sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem) css::uno::Type SAL_CALL BaseContainer::getElementType() - throw (css::uno::RuntimeException, std::exception) { // no lock necessary - because the type of our items // is fix! no internal call or member needed ... @@ -353,7 +332,6 @@ css::uno::Type SAL_CALL BaseContainer::getElementType() sal_Bool SAL_CALL BaseContainer::hasElements() - throw (css::uno::RuntimeException, std::exception) { bool bHasSome = false; @@ -380,7 +358,6 @@ sal_Bool SAL_CALL BaseContainer::hasElements() css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const OUString& /* sQuery */ ) - throw (css::uno::RuntimeException, std::exception) { OSL_FAIL("not pure virtual ... but not really implemented .-)"); @@ -390,7 +367,6 @@ 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, std::exception) { css::uno::Reference< css::container::XEnumeration > xEnum; OUStringList lKeys; @@ -437,7 +413,6 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea void SAL_CALL BaseContainer::flush() - throw (css::uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -512,7 +487,6 @@ void SAL_CALL BaseContainer::flush() void SAL_CALL BaseContainer::addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) - throw (css::uno::RuntimeException, std::exception) { // no locks necessary // used helper lives if we live and is threadsafe by itself ... @@ -521,7 +495,6 @@ 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, 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 fafe12fbed0e..75097f6abb85 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -174,8 +174,7 @@ class BaseContainer : public BaseLock @throws css::uno::RuntimeException */ - void impl_initFlushMode() - throw (css::uno::RuntimeException); + void impl_initFlushMode(); /** @short returns a pointer to the current used cache member. @@ -206,59 +205,38 @@ class BaseContainer : public BaseLock // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XNameContainer virtual void SAL_CALL insertByName(const OUString& sItem , - const css::uno::Any& aValue) - throw (css::lang::IllegalArgumentException , - css::container::ElementExistException, - css::lang::WrappedTargetException , - css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& aValue) override; - virtual void SAL_CALL removeByName(const OUString& sItem) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException , - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeByName(const OUString& sItem) override; // XNameReplace virtual void SAL_CALL replaceByName(const OUString& sItem , - const css::uno::Any& aValue) - throw (css::lang::IllegalArgumentException , - css::container::NoSuchElementException, - css::lang::WrappedTargetException , - css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& aValue) override; // XElementAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& sItem) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException , - css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& sItem) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; - virtual sal_Bool SAL_CALL hasByName(const OUString& sItem) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName(const OUString& sItem) override; - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() override; // XContainerQuery @@ -266,23 +244,18 @@ class BaseContainer : public BaseLock // must be implemented really by derived class ... // 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, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) override; // XFlushable - virtual void SAL_CALL flush() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flush() override; - virtual void SAL_CALL addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) override; - virtual void SAL_CALL removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) override; }; } // namespace config diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx index 4442a995b118..1698037791ea 100644 --- a/filter/source/config/cache/cacheupdatelistener.cxx +++ b/filter/source/config/cache/cacheupdatelistener.cxx @@ -80,7 +80,6 @@ void CacheUpdateListener::stopListening() void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEvent& aEvent) - throw(css::uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -179,7 +178,6 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven void SAL_CALL CacheUpdateListener::disposing(const css::lang::EventObject& aEvent) - 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 a5385f86e409..163b27f14af7 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -103,13 +103,11 @@ 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, std::exception) override; + virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) override; // lang.XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override; }; } // namespace config diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index fc220f2e7000..94f2d0959671 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -37,26 +37,22 @@ ConfigFlush::~ConfigFlush() } OUString SAL_CALL ConfigFlush::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return impl_getImplementationName(); // <- SAFE } sal_Bool SAL_CALL ConfigFlush::supportsService(const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence< OUString > SAL_CALL ConfigFlush::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return impl_getSupportedServiceNames(); } void SAL_CALL ConfigFlush::refresh() - throw(css::uno::RuntimeException, std::exception) { // notify listener outside the lock! // The used listener helper lives if we live @@ -89,7 +85,6 @@ void SAL_CALL ConfigFlush::refresh() void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) - throw(css::uno::RuntimeException, std::exception) { // no locks necessary // used helper lives if we live and is threadsafe by itself ... @@ -99,7 +94,6 @@ 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, 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 0239334c8023..f2cd8bd9ee3e 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -76,26 +76,20 @@ class ConfigFlush : public BaseLock // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XRefreshable - virtual void SAL_CALL refresh() - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh() override; - virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) override; - virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) override; // 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 fd4d9e0b26e1..8ab5279e7ccf 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -49,8 +49,6 @@ ContentHandlerFactory::~ContentHandlerFactory() css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstance(const OUString& sHandler) - throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) { return createInstanceWithArguments(sHandler, css::uno::Sequence< css::uno::Any >()); } @@ -58,8 +56,6 @@ 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, std::exception) { css::uno::Reference< css::uno::XInterface > xHandler; @@ -133,7 +129,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea css::uno::Sequence< OUString > SAL_CALL ContentHandlerFactory::getAvailableServiceNames() - 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 eebd5b52eb0e..f684b4048667 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -66,17 +66,12 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sHandler) - throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sHandler) override; 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, std::exception) override; + const css::uno::Sequence< css::uno::Any >& lArguments) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; // static uno helper! @@ -122,21 +117,21 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine // Overrides to resolve ambiguity - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) override { return BaseContainer::getByName(aName); } - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() override { return BaseContainer::getElementNames(); } - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) override { return BaseContainer::hasByName(aName); } - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType() override { return BaseContainer::getElementType(); } - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements() override { return BaseContainer::hasElements(); } - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) override { return BaseContainer::createSubSetEnumerationByQuery(Query); } - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) override { return BaseContainer::createSubSetEnumerationByProperties(Properties); } diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index c0867ede0db6..d01ec3792713 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -199,7 +199,6 @@ void FilterCache::takeOver(const FilterCache& rClone) } void FilterCache::load(EFillState eRequired) - throw(css::uno::Exception, std::exception) { // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); @@ -240,7 +239,6 @@ void FilterCache::load(EFillState eRequired) } bool FilterCache::isFillState(FilterCache::EFillState eState) const - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -252,7 +250,6 @@ bool FilterCache::isFillState(FilterCache::EFillState eState) const OUStringList FilterCache::getMatchingItemsByProps( EItemType eType , const CacheItem& lIProps, const CacheItem& lEProps) const - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -287,7 +284,6 @@ OUStringList FilterCache::getMatchingItemsByProps( EItemType eType , bool FilterCache::hasItems(EItemType eType) const - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -303,7 +299,6 @@ bool FilterCache::hasItems(EItemType eType) const OUStringList FilterCache::getItemNames(EItemType eType) const - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -327,7 +322,6 @@ OUStringList FilterCache::getItemNames(EItemType eType) const bool FilterCache::hasItem( EItemType eType, const OUString& sItem) - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -360,7 +354,6 @@ bool FilterCache::hasItem( EItemType eType, CacheItem FilterCache::getItem( EItemType eType, const OUString& sItem) - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -411,7 +404,6 @@ CacheItem FilterCache::getItem( EItemType eType, void FilterCache::removeItem( EItemType eType, const OUString& sItem) - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -433,7 +425,6 @@ void FilterCache::removeItem( EItemType eType, void FilterCache::setItem( EItemType eType , const OUString& sItem , const CacheItem& aValue) - throw(css::uno::Exception, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -461,7 +452,6 @@ void FilterCache::setItem( EItemType eType , void FilterCache::refreshItem( EItemType eType, const OUString& sItem) - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -472,7 +462,6 @@ void FilterCache::refreshItem( EItemType eType, void FilterCache::addStatePropsToItem( EItemType eType, const OUString& sItem, CacheItem& rItem) - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -566,7 +555,6 @@ void FilterCache::addStatePropsToItem( EItemType eType, void FilterCache::removeStatePropsFromItem(CacheItem& rItem) - throw(css::uno::Exception) { CacheItem::iterator pIt; pIt = rItem.find(PROPNAME_FINALIZED); @@ -579,7 +567,6 @@ void FilterCache::removeStatePropsFromItem(CacheItem& rItem) void FilterCache::flush() - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -619,7 +606,6 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN EItemType eType , const CacheItemList& rCache, const OUStringList& lItems) - throw(css::uno::Exception) { css::uno::Reference< css::container::XNameContainer > xAddRemoveSet(xSet, css::uno::UNO_QUERY); css::uno::Reference< css::container::XNameReplace > xReplaceeSet(xSet, css::uno::UNO_QUERY); @@ -678,7 +664,6 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN void FilterCache::detectFlatForURL(const css::util::URL& aURL , FlatDetection& rFlatTypes) const - throw(css::uno::Exception) { // extract extension from URL, so it can be used directly as key into our hash map! // Note further: It must be converted to lower case, because the optimize hash @@ -780,7 +765,6 @@ CacheItemList& FilterCache::impl_getItemList(EItemType eType) } css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfigProvider eProvider) - throw(css::uno::Exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -969,7 +953,6 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess void FilterCache::impl_validateAndOptimize() - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -1244,7 +1227,6 @@ void FilterCache::impl_validateAndOptimize() void FilterCache::impl_addItem2FlushList( EItemType eType, const OUString& sItem) - throw(css::uno::Exception) { OUStringList* pList = nullptr; switch(eType) @@ -1276,7 +1258,6 @@ void FilterCache::impl_addItem2FlushList( EItemType eType, FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet , const CacheItemList& rList, const OUString& sItem) - throw(css::uno::Exception) { bool bExistsInConfigLayer = xSet->hasByName(sItem); bool bExistsInMemory = (rList.find(sItem) != rList.end()); @@ -1297,7 +1278,6 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css:: } void FilterCache::impl_load(EFillState eRequiredState) - throw(css::uno::Exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -1404,7 +1384,6 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA EItemType eType , EReadOption eOption, CacheItemList* pCache ) - throw(css::uno::Exception, std::exception) { // get access to the right configuration set OUString sSetName; @@ -1511,7 +1490,6 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::container::XNameAccess >& xNode, CacheItem& rItem) - throw(css::uno::Exception, std::exception) { // SAFE -> ---------------------------------- @@ -1571,7 +1549,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe void FilterCache::impl_savePatchUINames(const css::uno::Reference< css::container::XNameReplace >& xNode, const CacheItem& rItem) - throw(css::uno::Exception) { css::uno::Reference< css::container::XNameContainer > xAdd (xNode, css::uno::UNO_QUERY); css::uno::Reference< css::container::XNameAccess > xCheck(xNode, css::uno::UNO_QUERY); @@ -1600,7 +1577,6 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: EItemType eType , const OUString& sItem , EReadOption eOption) - throw(css::uno::Exception, std::exception) { // try to get an API object, which points directly to the // requested item. If it fail an exception should occur and @@ -1708,7 +1684,6 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType eType, const OUString& sItem) - throw (css::uno::Exception, std::exception) { CacheItemList* pList = nullptr; css::uno::Reference< css::uno::XInterface > xConfig ; @@ -1782,7 +1757,6 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XNameReplace >& xItem, EItemType eType, const CacheItem & aItem) - throw(css::uno::Exception) { // This function changes the properties of aItem one-by-one; but it also // listens to the configuration changes and reloads the whole item from the @@ -2162,7 +2136,6 @@ void FilterCache::impl_readOldFormat() CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType, const OUString& sItem) - throw(css::uno::Exception, std::exception) { css::uno::Reference< css::container::XNameAccess > xItem; xSet->getByName(sItem) >>= xItem; diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 976d47ea8c24..b47252f0cfaa 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -317,8 +317,7 @@ class FilterCache : public BaseLock at all if this method does nothing inside, because the cache is already fully filled! */ - void load(EFillState eRequired) - throw (css::uno::Exception, std::exception); + void load(EFillState eRequired); /** @short return the current fill state of this cache. @@ -334,8 +333,7 @@ class FilterCache : public BaseLock @throws css::uno::Exception */ - bool isFillState(EFillState eRequired) const - throw(css::uno::Exception); + bool isFillState(EFillState eRequired) const; /** @short return a list of key names for items, which match @@ -371,8 +369,7 @@ class FilterCache : public BaseLock */ OUStringList getMatchingItemsByProps( EItemType eType , const CacheItem& lIProps , - const CacheItem& lEProps = CacheItem()) const - throw(css::uno::Exception); + const CacheItem& lEProps = CacheItem()) const; /** @short indicates if the requested sub container @@ -396,8 +393,7 @@ class FilterCache : public BaseLock if some input parameter are wrong or the cache itself is not valid any longer, because any operation before damage it. */ - bool hasItems(EItemType eType) const - throw(css::uno::Exception); + bool hasItems(EItemType eType) const; /** @short return a list of all key names, which represent @@ -420,8 +416,7 @@ class FilterCache : public BaseLock if some input parameter are wrong or the cache itself is not valid any longer, because any operation before damage it. */ - OUStringList getItemNames(EItemType eType) const - throw(css::uno::Exception); + OUStringList getItemNames(EItemType eType) const; /** @short check if the required item exist inside this container. @@ -444,8 +439,7 @@ class FilterCache : public BaseLock any longer, because any operation before damage it. */ bool hasItem( EItemType eType, - const OUString& sItem) - throw(css::uno::Exception); + const OUString& sItem); /** @short return an item, which match the specified type and name. @@ -473,8 +467,7 @@ class FilterCache : public BaseLock any longer, because any operation before damage it. */ CacheItem getItem( EItemType eType, - const OUString& sItem) - throw(css::uno::Exception); + const OUString& sItem); /** TODO document me ... @@ -482,8 +475,7 @@ class FilterCache : public BaseLock @throws css::uno::Exception */ void removeItem( EItemType eType, - const OUString& sItem) - throw(css::uno::Exception); + const OUString& sItem); /** TODO document me ... @@ -492,8 +484,7 @@ class FilterCache : public BaseLock */ void setItem( EItemType eType , const OUString& sItem , - const CacheItem& aValue) - throw(css::uno::Exception, std::exception); + const CacheItem& aValue); /** TODO document me ... @@ -501,8 +492,7 @@ class FilterCache : public BaseLock @throws css::uno::Exception */ void refreshItem( EItemType eType, - const OUString& sItem) - throw(css::uno::Exception); + const OUString& sItem); /** @short add some implicit properties to the given @@ -542,16 +532,14 @@ class FilterCache : public BaseLock */ void addStatePropsToItem( EItemType eType, const OUString& sItem, - CacheItem& rItem) - throw(css::uno::Exception); + CacheItem& rItem); /** TODO document me @throws css::uno::Exception */ - static void removeStatePropsFromItem(CacheItem& aValue) - throw(css::uno::Exception); + static void removeStatePropsFromItem(CacheItem& aValue); /** @short force writing of all changes (which was made after @@ -563,8 +551,7 @@ class FilterCache : public BaseLock if the cache itself is not valid any longer, because any operation before damage it. */ - void flush() - throw(css::uno::Exception); + void flush(); /** @short supports a flat type detection for given URL. @@ -594,8 +581,7 @@ class FilterCache : public BaseLock any longer, because any operation before damage it. */ void detectFlatForURL(const css::util::URL& aURL , - FlatDetection& rFlatTypes) const - throw(css::uno::Exception); + FlatDetection& rFlatTypes) const; // private helper @@ -640,8 +626,7 @@ class FilterCache : public BaseLock all necessary listener connections will be established too. So this cache will be informed about outside updates. */ - css::uno::Reference< css::uno::XInterface > impl_openConfig(EConfigProvider eProvide) - throw(css::uno::Exception); + css::uno::Reference< css::uno::XInterface > impl_openConfig(EConfigProvider eProvide); /** @short tries to open the requested configuration root @@ -701,8 +686,7 @@ class FilterCache : public BaseLock @throws css::uno::Exception */ - void impl_load(EFillState eRequiredState) - throw(css::uno::Exception); + void impl_load(EFillState eRequiredState); /** @short validate the whole cache and create @@ -721,8 +705,7 @@ class FilterCache : public BaseLock @throw [css::uno::Exception] if cache is invalid and could not be repaired. */ - void impl_validateAndOptimize() - throw(css::uno::Exception); + void impl_validateAndOptimize(); private: @@ -755,8 +738,7 @@ class FilterCache : public BaseLock void impl_loadSet(const css::uno::Reference< css::container::XNameAccess >& xConfig, EItemType eType , EReadOption eOption, - CacheItemList* pCache ) - throw (css::uno::Exception, std::exception); + CacheItemList* pCache ); /** @short read the specified container item from the given configuration set. @@ -784,8 +766,7 @@ class FilterCache : public BaseLock CacheItem impl_loadItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , const OUString& sItem , - EReadOption eOption) - throw(css::uno::Exception, std::exception); + EReadOption eOption); /** @short try to load the requested item on demand from the underlying configuration @@ -814,8 +795,7 @@ class FilterCache : public BaseLock if an unrecoverable error occurs inside this operation. */ CacheItemList::iterator impl_loadItemOnDemand( EItemType eType, - const OUString& sItem) - throw (css::uno::Exception, std::exception); + const OUString& sItem); /** TODO @@ -824,8 +804,7 @@ class FilterCache : public BaseLock */ static void impl_saveItem(const css::uno::Reference< css::container::XNameReplace >& xSet , EItemType eType , - const CacheItem & aValue) - throw(css::uno::Exception); + const CacheItem & aValue); /** TODO @@ -833,8 +812,7 @@ class FilterCache : public BaseLock @throws css::uno::Exception */ void impl_addItem2FlushList( EItemType eType, - const OUString& sItem) - throw(css::uno::Exception); + const OUString& sItem); /** TODO @@ -844,8 +822,7 @@ class FilterCache : public BaseLock static void impl_flushByList(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , const CacheItemList& rCache, - const OUStringList& lItems) - throw(css::uno::Exception); + const OUStringList& lItems); /** @short specify, which save operation is necessary for the specified item. @@ -877,8 +854,7 @@ class FilterCache : public BaseLock */ static EItemFlushState impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet , const CacheItemList& rList, - const OUString& sItem) - throw(css::uno::Exception); + const OUString& sItem); /** TODO @@ -886,8 +862,7 @@ class FilterCache : public BaseLock @throws css::uno::Exception */ void impl_readPatchUINames(const css::uno::Reference< css::container::XNameAccess >& xNode, - CacheItem& rItem) - throw(css::uno::Exception, std::exception); + CacheItem& rItem); /** TODO @@ -895,8 +870,7 @@ class FilterCache : public BaseLock @throws css::uno::Exception */ static void impl_savePatchUINames(const css::uno::Reference< css::container::XNameReplace >& xNode, - const CacheItem& rItem) - throw(css::uno::Exception); + const CacheItem& rItem); /** TODO */ void impl_readOldFormat(); @@ -907,8 +881,7 @@ class FilterCache : public BaseLock */ CacheItem impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType, - const OUString& sItem) - throw(css::uno::Exception, std::exception); + const OUString& sItem); /** TODO */ diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 079bd648b5b3..e3e81d11bc17 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -67,8 +67,6 @@ FilterFactory::~FilterFactory() css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstance(const OUString& sFilter) - throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) { return createInstanceWithArguments(sFilter, css::uno::Sequence< css::uno::Any >()); } @@ -76,8 +74,6 @@ 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, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -152,7 +148,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames() - 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, @@ -179,7 +174,6 @@ 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, std::exception) { // reject old deprecated queries ... if (sQuery.startsWith("_filterquery_")) diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 8007f85235ff..c0e9a34d5aa3 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -67,23 +67,17 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sFilter) - throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sFilter) override; 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, std::exception) override; + const css::uno::Sequence< css::uno::Any >& lArguments) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; // XContainerQuery - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) override; // internal helper! diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 09d545a366d2..c8a6ac03b69c 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -48,8 +48,6 @@ FrameLoaderFactory::~FrameLoaderFactory() css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstance(const OUString& sLoader) - throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) { return createInstanceWithArguments(sLoader, css::uno::Sequence< css::uno::Any >()); } @@ -57,8 +55,6 @@ 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, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -130,7 +126,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI css::uno::Sequence< OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceNames() - 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 39772ad3f994..7dab5e02b0d9 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -66,17 +66,12 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sLoader) - throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sLoader) override; 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, std::exception) override; + const css::uno::Sequence< css::uno::Any >& lArguments) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; // static uno helper! @@ -121,21 +116,21 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); // Overrides to resolve ambiguity - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) override { return BaseContainer::getByName(aName); } - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() override { return BaseContainer::getElementNames(); } - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) override { return BaseContainer::hasByName(aName); } - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType() override { return BaseContainer::getElementType(); } - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements() override { return BaseContainer::hasElements(); } - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) override { return BaseContainer::createSubSetEnumerationByQuery(Query); } - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) override { return BaseContainer::createSubSetEnumerationByProperties(Properties); } }; diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 4638e290e17f..6e4ef616d230 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -64,7 +64,6 @@ TypeDetection::~TypeDetection() OUString SAL_CALL TypeDetection::queryTypeByURL(const OUString& sURL) - throw (css::uno::RuntimeException, std::exception) { OUString sType; @@ -369,7 +368,6 @@ 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, std::exception) { // make the descriptor more useable :-) utl::MediaDescriptor stlDescriptor(lDescriptor); @@ -1129,7 +1127,6 @@ OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript void TypeDetection::impl_openStream(utl::MediaDescriptor& rDescriptor) - throw (css::uno::Exception) { bool bSuccess = false; OUString sURL = rDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_URL(), OUString() ); diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index c65a946dc05a..b8dfc1c48cff 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -213,8 +213,7 @@ private: Note: If an interactionHandler is part of the given descriptor too, it was already used. Means: let the exception pass through the top most interface method! */ - void impl_openStream(utl::MediaDescriptor& rDescriptor) - throw (css::uno::Exception); + void impl_openStream(utl::MediaDescriptor& rDescriptor); /** @short validate the specified type and its relationships @@ -315,12 +314,10 @@ public: // XTypeDetection - virtual OUString SAL_CALL queryTypeByURL(const OUString& sURL) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL queryTypeByURL(const OUString& sURL) override; virtual OUString SAL_CALL queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, - sal_Bool bAllowDeep ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAllowDeep ) override; // static uno helper! |