diff options
Diffstat (limited to 'desktop/source/deployment/registry')
12 files changed, 110 insertions, 368 deletions
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index a6ddce438442..d00143157765 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -321,11 +321,9 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) override; + getSupportedPackageTypes() override; - virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) override; + virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override; using PackageRegistryBackend::disposing; @@ -585,14 +583,12 @@ void BackendImpl::revokeEntryFromDb(OUString const & url) // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) +BackendImpl::getSupportedPackageTypes() { return m_typeInfos; } void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) { if (m_backendDb.get()) m_backendDb->removeEntry(url); diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index dcd30b46c497..21bc2e49d976 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -150,10 +150,8 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) override; + getSupportedPackageTypes() override; + virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override; using PackageRegistryBackend::disposing; }; @@ -284,13 +282,11 @@ bool BackendImpl::activateEntry(OUString const & url) // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) +BackendImpl::getSupportedPackageTypes() { return m_typeInfos; } void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) { if (m_backendDb.get()) m_backendDb->removeEntry(url); diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 122706966069..2c2ee723f43d 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -58,7 +58,6 @@ PackageRegistryBackend::~PackageRegistryBackend() void PackageRegistryBackend::disposing( lang::EventObject const & event ) - throw (RuntimeException, std::exception) { Reference<deployment::XPackage> xPackage( event.Source, UNO_QUERY_THROW ); @@ -139,10 +138,6 @@ void PackageRegistryBackend::disposing() Reference<deployment::XPackage> PackageRegistryBackend::bindPackage( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) - throw (deployment::DeploymentException, - deployment::InvalidRemovedParameterException, - ucb::CommandFailedException, - lang::IllegalArgumentException, RuntimeException, std::exception) { ::osl::ResettableMutexGuard guard( getMutex() ); check(); @@ -354,7 +349,7 @@ void Package::check() const // XComponent -void Package::dispose() throw (RuntimeException, std::exception) +void Package::dispose() { //Do not call check here. We must not throw an exception here if the object //is being disposed or is already disposed. See com.sun.star.lang.XComponent @@ -363,7 +358,7 @@ void Package::dispose() throw (RuntimeException, std::exception) void Package::addEventListener( - Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception) + Reference<lang::XEventListener> const & xListener ) { //Do not call check here. We must not throw an exception here if the object //is being disposed or is already disposed. See com.sun.star.lang.XComponent @@ -372,7 +367,7 @@ void Package::addEventListener( void Package::removeEventListener( - Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception) + Reference<lang::XEventListener> const & xListener ) { //Do not call check here. We must not throw an exception here if the object //is being disposed or is already disposed. See com.sun.star.lang.XComponent @@ -383,7 +378,6 @@ void Package::removeEventListener( void Package::addModifyListener( Reference<util::XModifyListener> const & xListener ) - throw (RuntimeException, std::exception) { check(); rBHelper.addListener( cppu::UnoType<decltype(xListener)>::get(), xListener ); @@ -392,7 +386,6 @@ void Package::addModifyListener( void Package::removeModifyListener( Reference<util::XModifyListener> const & xListener ) - throw (RuntimeException, std::exception) { check(); rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener ); @@ -411,14 +404,13 @@ void Package::checkAborted( // XPackage Reference<task::XAbortChannel> Package::createAbortChannel() - throw (RuntimeException, std::exception) { check(); return new AbortChannel; } -sal_Bool Package::isBundle() throw (RuntimeException, std::exception) +sal_Bool Package::isBundle() { return false; // default } @@ -428,11 +420,6 @@ sal_Bool Package::isBundle() throw (RuntimeException, std::exception) const css::uno::Reference< css::task::XAbortChannel >&, const css::uno::Reference< css::ucb::XCommandEnvironment >&, sal_Bool) - throw (css::deployment::DeploymentException, - css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -442,10 +429,6 @@ sal_Bool Package::isBundle() throw (RuntimeException, std::exception) sal_Bool Package::checkDependencies( const css::uno::Reference< css::ucb::XCommandEnvironment >& ) - throw (css::deployment::DeploymentException, - css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, - css::uno::RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -456,20 +439,17 @@ sal_Bool Package::checkDependencies( Sequence< Reference<deployment::XPackage> > Package::getBundle( Reference<task::XAbortChannel> const &, Reference<XCommandEnvironment> const & ) - throw (deployment::DeploymentException, - CommandFailedException, CommandAbortedException, - lang::IllegalArgumentException, RuntimeException, std::exception) { return Sequence< Reference<deployment::XPackage> >(); } -OUString Package::getName() throw (RuntimeException, std::exception) +OUString Package::getName() { return m_name; } -beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException, std::exception) +beans::Optional<OUString> Package::getIdentifier() { if (m_bRemoved) return beans::Optional<OUString>(true, m_identifier); @@ -478,9 +458,7 @@ beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException, std: } -OUString Package::getVersion() throw ( - deployment::ExtensionRemovedException, - RuntimeException, std::exception) +OUString Package::getVersion() { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -488,14 +466,13 @@ OUString Package::getVersion() throw ( } -OUString Package::getURL() throw (RuntimeException, std::exception) +OUString Package::getURL() { return m_url; } -OUString Package::getDisplayName() throw ( - deployment::ExtensionRemovedException, RuntimeException, std::exception) +OUString Package::getDisplayName() { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -503,8 +480,7 @@ OUString Package::getDisplayName() throw ( } -OUString Package::getDescription() throw ( - deployment::ExtensionRemovedException,RuntimeException, std::exception) +OUString Package::getDescription() { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -512,10 +488,7 @@ OUString Package::getDescription() throw ( } -OUString Package::getLicenseText()throw ( - deployment::DeploymentException, - deployment::ExtensionRemovedException, - RuntimeException, std::exception) +OUString Package::getLicenseText() { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -523,8 +496,7 @@ OUString Package::getLicenseText()throw ( } -Sequence<OUString> Package::getUpdateInformationURLs() throw ( - deployment::ExtensionRemovedException, RuntimeException, std::exception) +Sequence<OUString> Package::getUpdateInformationURLs() { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -532,8 +504,7 @@ Sequence<OUString> Package::getUpdateInformationURLs() throw ( } -css::beans::StringPair Package::getPublisherInfo() throw ( - deployment::ExtensionRemovedException, RuntimeException, std::exception) +css::beans::StringPair Package::getPublisherInfo() { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -543,7 +514,6 @@ css::beans::StringPair Package::getPublisherInfo() throw ( uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContrast*/ ) - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception ) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -554,7 +524,6 @@ uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContr Reference<deployment::XPackageTypeInfo> Package::getPackageType() - throw (RuntimeException, std::exception) { return m_xPackageType; } @@ -562,9 +531,6 @@ Reference<deployment::XPackageTypeInfo> Package::getPackageType() void Package::exportTo( OUString const & destFolderURL, OUString const & newTitle, sal_Int32 nameClashAction, Reference<XCommandEnvironment> const & xCmdEnv ) - throw (deployment::ExtensionRemovedException, - CommandFailedException, CommandAbortedException, ContentCreationException, - RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -610,8 +576,6 @@ void Package::fireModified() beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered( Reference<task::XAbortChannel> const & xAbortChannel, Reference<XCommandEnvironment> const & xCmdEnv ) - throw (deployment::DeploymentException, - CommandFailedException, CommandAbortedException, RuntimeException, std::exception) { try { ::osl::ResettableMutexGuard guard( getMutex() ); @@ -722,10 +686,6 @@ void Package::registerPackage( sal_Bool startup, Reference<task::XAbortChannel> const & xAbortChannel, Reference<XCommandEnvironment> const & xCmdEnv ) - throw (deployment::DeploymentException, - deployment::ExtensionRemovedException, - CommandFailedException, CommandAbortedException, - lang::IllegalArgumentException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -737,9 +697,6 @@ void Package::revokePackage( sal_Bool startup, Reference<task::XAbortChannel> const & xAbortChannel, Reference<XCommandEnvironment> const & xCmdEnv ) - throw (deployment::DeploymentException, - CommandFailedException, CommandAbortedException, - lang::IllegalArgumentException, RuntimeException, std::exception) { processPackage_impl( false /* revoke */, startup, xAbortChannel, xCmdEnv ); @@ -761,16 +718,12 @@ PackageRegistryBackend * Package::getMyBackend() const } OUString Package::getRepositoryName() - throw (RuntimeException, std::exception) { PackageRegistryBackend * backEnd = getMyBackend(); return backEnd->getContext(); } beans::Optional< OUString > Package::getRegistrationDataURL() - throw (deployment::DeploymentException, - deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -778,7 +731,6 @@ beans::Optional< OUString > Package::getRegistrationDataURL() } sal_Bool Package::isRemoved() - throw (RuntimeException, std::exception) { return m_bRemoved; } @@ -789,32 +741,29 @@ Package::TypeInfo::~TypeInfo() // XPackageTypeInfo -OUString Package::TypeInfo::getMediaType() throw (RuntimeException, std::exception) +OUString Package::TypeInfo::getMediaType() { return m_mediaType; } OUString Package::TypeInfo::getDescription() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { return getShortDescription(); } OUString Package::TypeInfo::getShortDescription() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { return m_shortDescr; } -OUString Package::TypeInfo::getFileFilter() throw (RuntimeException, std::exception) +OUString Package::TypeInfo::getFileFilter() { return m_fileFilter; } Any Package::TypeInfo::getIcon( sal_Bool /*highContrast*/, sal_Bool /*smallIcon*/ ) - throw (RuntimeException, std::exception) { return Any(); } diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index d1b77a020af9..7edf53fd2860 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -105,21 +105,15 @@ public: Reference<XComponentContext> const & xComponentContext ); // XUpdatable - virtual void SAL_CALL update() throw (RuntimeException, std::exception) override; + virtual void SAL_CALL update() override; // XPackageRegistry virtual Reference<deployment::XPackage> SAL_CALL bindPackage( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, - OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) - throw (deployment::DeploymentException, - deployment::InvalidRemovedParameterException, - CommandFailedException, - lang::IllegalArgumentException, RuntimeException, std::exception) override; + OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) - throw (deployment::DeploymentException, - RuntimeException, std::exception) override; + getSupportedPackageTypes() override; + virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override; }; @@ -172,8 +166,6 @@ OUString normalizeMediaType( OUString const & mediaType ) void PackageRegistryImpl::packageRemoved( OUString const & url, OUString const & mediaType) - throw (css::deployment::DeploymentException, - css::uno::RuntimeException, std::exception) { const t_string2registry::const_iterator i = m_mediaType2backend.find(mediaType); @@ -437,7 +429,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( // XUpdatable: broadcast to backends -void PackageRegistryImpl::update() throw (RuntimeException, std::exception) +void PackageRegistryImpl::update() { check(); t_registryset::const_iterator iPos( m_allBackends.begin() ); @@ -454,9 +446,6 @@ void PackageRegistryImpl::update() throw (RuntimeException, std::exception) Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( OUString const & url, OUString const & mediaType_, sal_Bool bRemoved, OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) - throw (deployment::DeploymentException, deployment::InvalidRemovedParameterException, - CommandFailedException, - lang::IllegalArgumentException, RuntimeException, std::exception) { check(); OUString mediaType(mediaType_); @@ -539,7 +528,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( Sequence< Reference<deployment::XPackageTypeInfo> > -PackageRegistryImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) +PackageRegistryImpl::getSupportedPackageTypes() { return comphelper::containerToSequence(m_typesInfos); } diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 118210452ec5..50a14b9b9428 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -93,10 +93,8 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) override; + getSupportedPackageTypes() override; + virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override; }; @@ -139,15 +137,13 @@ bool BackendImpl::hasActiveEntry(OUString const & url) // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) +BackendImpl::getSupportedPackageTypes() { return Sequence<Reference<deployment::XPackageTypeInfo> >( & m_xExecutableTypeInfo, 1); } void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) { if (m_backendDb.get()) m_backendDb->removeEntry(url); diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 4b5f78e8393d..6c29f8a43c84 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -84,9 +84,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool extensionContainsCompiledHelp(); //XPackage - virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() - throw (deployment::DeploymentException, deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) override; + virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() override; }; friend class PackageImpl; @@ -118,10 +116,8 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) override; + getSupportedPackageTypes() override; + virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override; }; @@ -156,14 +152,12 @@ BackendImpl::BackendImpl( // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) +BackendImpl::getSupportedPackageTypes() { return m_typeInfos; } void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) { if (m_backendDb.get()) m_backendDb->removeEntry(url); @@ -343,9 +337,6 @@ void BackendImpl::PackageImpl::processPackage_( } beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL() - throw (deployment::DeploymentException, - deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index deba0dda93f2..ad717500c181 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -116,144 +116,78 @@ public: m_shortDescr(shortDescr) {} // XPackageTypeInfo - virtual OUString SAL_CALL getMediaType() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDescription() - throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getShortDescription() - throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFileFilter() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getMediaType() override; + virtual OUString SAL_CALL getDescription() override; + virtual OUString SAL_CALL getShortDescription() override; + virtual OUString SAL_CALL getFileFilter() override; virtual css::uno::Any SAL_CALL getIcon( sal_Bool highContrast, - sal_Bool smallIcon ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool smallIcon ) override; }; // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( - css::uno::Reference<css::lang::XEventListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::lang::XEventListener> const & xListener ) override; virtual void SAL_CALL removeEventListener( - css::uno::Reference<css::lang::XEventListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::lang::XEventListener> const & xListener ) override; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( - css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::util::XModifyListener> const & xListener ) override; virtual void SAL_CALL removeModifyListener( - css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::util::XModifyListener> const & xListener ) override; // XPackage virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL - createAbortChannel() throw (css::uno::RuntimeException, std::exception) override; + createAbortChannel() override; virtual css::beans::Optional< css::beans::Ambiguous<sal_Bool> > SAL_CALL isRegistered( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, - css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) - throw (css::deployment::DeploymentException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override; virtual ::sal_Int32 SAL_CALL checkPrerequisites( const css::uno::Reference< css::task::XAbortChannel >& xAbortChannel, const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv, - sal_Bool noLicenseChecking) - throw (css::deployment::DeploymentException, - css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception) override; + sal_Bool noLicenseChecking) override; virtual ::sal_Bool SAL_CALL checkDependencies( - const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) - throw (css::deployment::DeploymentException, - css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) override; virtual void SAL_CALL registerPackage( sal_Bool startup, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, - css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) - throw (css::deployment::DeploymentException, - css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, - css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override; virtual void SAL_CALL revokePackage( sal_Bool startup, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, - css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) - throw (css::deployment::DeploymentException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBundle() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override; + virtual sal_Bool SAL_CALL isBundle() override; virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> > SAL_CALL getBundle( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, - css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) - throw (css::deployment::DeploymentException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::beans::Optional< OUString > SAL_CALL getIdentifier() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getVersion() - throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDisplayName() - throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDescription() - throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLicenseText() - throw (css::deployment::DeploymentException, - css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override; + virtual OUString SAL_CALL getName() override; + virtual css::beans::Optional< OUString > SAL_CALL getIdentifier() override; + virtual OUString SAL_CALL getVersion() override; + virtual OUString SAL_CALL getURL() override; + virtual OUString SAL_CALL getDisplayName() override; + virtual OUString SAL_CALL getDescription() override; + virtual OUString SAL_CALL getLicenseText() override; virtual css::uno::Sequence< OUString > SAL_CALL - getUpdateInformationURLs() - throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) override; - virtual css::beans::StringPair SAL_CALL getPublisherInfo() - throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) override; + getUpdateInformationURLs() override; + virtual css::beans::StringPair SAL_CALL getPublisherInfo() override; virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL - getIcon( sal_Bool bHighContrast ) - throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) override; + getIcon( sal_Bool bHighContrast ) override; virtual css::uno::Reference<css::deployment::XPackageTypeInfo> SAL_CALL - getPackageType() throw (css::uno::RuntimeException, std::exception) override; + getPackageType() override; virtual void SAL_CALL exportTo( OUString const & destFolderURL, OUString const & newTitle, sal_Int32 nameClashAction, - css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) - throw (css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::ucb::ContentCreationException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRepositoryName() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() - throw (css::deployment::DeploymentException, - css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isRemoved() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override; + virtual OUString SAL_CALL getRepositoryName() override; + virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() override; + virtual sal_Bool SAL_CALL isRemoved() override; }; @@ -344,18 +278,13 @@ public: const OUString& getContext() const {return m_context; } // XEventListener - virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) override; // XPackageRegistry virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL bindPackage( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, OUString const & identifier, - css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) - throw (css::deployment::DeploymentException, - css::deployment::InvalidRemovedParameterException, - css::ucb::CommandFailedException, - css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override; // virtual void SAL_CALL packageRemoved( // OUString const & url, OUString const & mediaType) diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 174b4978ee18..08ba82f8cc8f 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -135,11 +135,7 @@ class BackendImpl : public ImplBaseT /// @throws RuntimeException bool checkLicense( Reference< ucb::XCommandEnvironment > const & xCmdEnv, - DescriptionInfoset const & description, bool bNoLicenseChecking) - throw (deployment::DeploymentException, - ucb::CommandFailedException, - ucb::CommandAbortedException, - RuntimeException); + DescriptionInfoset const & description, bool bNoLicenseChecking); // @throws DeploymentException OUString getTextFromURL( const Reference< ucb::XCommandEnvironment >& xCmdEnv, @@ -173,69 +169,40 @@ class BackendImpl : public ImplBaseT OUString const & identifier); // XPackage - virtual sal_Bool SAL_CALL isBundle() throw (RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isBundle() override; virtual Sequence< Reference<deployment::XPackage> > SAL_CALL getBundle( Reference<task::XAbortChannel> const & xAbortChannel, - Reference<ucb::XCommandEnvironment> const & xCmdEnv ) - throw (deployment::DeploymentException, - ucb::CommandFailedException, - ucb::CommandAbortedException, - lang::IllegalArgumentException, RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDescription() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; - - virtual OUString SAL_CALL getLicenseText() - throw (deployment::DeploymentException, - deployment::ExtensionRemovedException, - RuntimeException, std::exception) override; + Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override; + virtual OUString SAL_CALL getDescription() override; + + virtual OUString SAL_CALL getLicenseText() override; virtual void SAL_CALL exportTo( OUString const & destFolderURL, OUString const & newTitle, sal_Int32 nameClashAction, - Reference<ucb::XCommandEnvironment> const & xCmdEnv ) - throw (deployment::ExtensionRemovedException, - ucb::CommandFailedException, - ucb::CommandAbortedException, - ucb::ContentCreationException, - RuntimeException, std::exception) override; + Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override; virtual ::sal_Int32 SAL_CALL checkPrerequisites( const Reference< task::XAbortChannel >& xAbortChannel, const Reference< ucb::XCommandEnvironment >& xCmdEnv, - sal_Bool noLicenseChecking) - throw (deployment::ExtensionRemovedException, - deployment::DeploymentException, - ucb::CommandFailedException, - ucb::CommandAbortedException, - RuntimeException, std::exception) override; + sal_Bool noLicenseChecking) override; virtual sal_Bool SAL_CALL checkDependencies( - const Reference< ucb::XCommandEnvironment >& xCmdEnv ) - throw (deployment::DeploymentException, - deployment::ExtensionRemovedException, - ucb::CommandFailedException, - RuntimeException, std::exception) override; + const Reference< ucb::XCommandEnvironment >& xCmdEnv ) override; - virtual beans::Optional<OUString> SAL_CALL getIdentifier() - throw (RuntimeException, std::exception) override; + virtual beans::Optional<OUString> SAL_CALL getIdentifier() override; - virtual OUString SAL_CALL getVersion() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; + virtual OUString SAL_CALL getVersion() override; - virtual Sequence<OUString> SAL_CALL getUpdateInformationURLs() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; + virtual Sequence<OUString> SAL_CALL getUpdateInformationURLs() override; - virtual beans::StringPair SAL_CALL getPublisherInfo() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; + virtual beans::StringPair SAL_CALL getPublisherInfo() override; - virtual OUString SAL_CALL getDisplayName() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDisplayName() override; virtual Reference< graphic::XGraphic > SAL_CALL - getIcon( sal_Bool bHighContrast ) - throw (deployment::ExtensionRemovedException, - RuntimeException, std::exception) override; + getIcon( sal_Bool bHighContrast ) override; }; friend class PackageImpl; @@ -265,18 +232,14 @@ public: Reference<deployment::XPackageRegistry> const & xRootRegistry ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( OUString const& name ) - throw (RuntimeException, std::exception) override; - virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( OUString const& name ) override; + virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) override; + getSupportedPackageTypes() override; + virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override; using ImplBaseT::disposing; }; @@ -332,19 +295,17 @@ void BackendImpl::disposing() } // XServiceInfo -OUString BackendImpl::getImplementationName() throw (RuntimeException, std::exception) +OUString BackendImpl::getImplementationName() { return OUString("com.sun.star.comp.deployment.bundle.PackageRegistryBackend"); } sal_Bool BackendImpl::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence<OUString> BackendImpl::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return { OUString(BACKEND_SERVICE_NAME) }; } @@ -352,14 +313,12 @@ Sequence<OUString> BackendImpl::getSupportedServiceNames() // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) +BackendImpl::getSupportedPackageTypes() { return m_typeInfos; } void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) { //Notify the backend responsible for processing the different media //types that this extension was removed. @@ -659,10 +618,6 @@ bool BackendImpl::PackageImpl::checkDependencies( bool BackendImpl::PackageImpl::checkLicense( css::uno::Reference< css::ucb::XCommandEnvironment > const & xCmdEnv, DescriptionInfoset const & info, bool alreadyInstalled) - throw (css::deployment::DeploymentException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, - css::uno::RuntimeException) { try { @@ -731,11 +686,6 @@ bool BackendImpl::PackageImpl::checkLicense( const css::uno::Reference< css::task::XAbortChannel >&, const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv, sal_Bool alreadyInstalled) - throw (css::deployment::DeploymentException, - css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -760,10 +710,6 @@ bool BackendImpl::PackageImpl::checkLicense( sal_Bool BackendImpl::PackageImpl::checkDependencies( const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) - throw (deployment::DeploymentException, - deployment::ExtensionRemovedException, - ucb::CommandFailedException, - RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -775,7 +721,6 @@ sal_Bool BackendImpl::PackageImpl::checkDependencies( } beans::Optional<OUString> BackendImpl::PackageImpl::getIdentifier() - throw (RuntimeException, std::exception) { OUString identifier; if (m_bRemoved) @@ -789,7 +734,6 @@ beans::Optional<OUString> BackendImpl::PackageImpl::getIdentifier() } OUString BackendImpl::PackageImpl::getVersion() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -797,7 +741,6 @@ OUString BackendImpl::PackageImpl::getVersion() } Sequence<OUString> BackendImpl::PackageImpl::getUpdateInformationURLs() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -805,7 +748,6 @@ Sequence<OUString> BackendImpl::PackageImpl::getUpdateInformationURLs() } beans::StringPair BackendImpl::PackageImpl::getPublisherInfo() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -816,7 +758,6 @@ beans::StringPair BackendImpl::PackageImpl::getPublisherInfo() uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool bHighContrast ) - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception ) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -976,7 +917,6 @@ void BackendImpl::PackageImpl::processPackage_( OUString BackendImpl::PackageImpl::getDescription() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -1004,9 +944,6 @@ OUString BackendImpl::PackageImpl::getDescription() OUString BackendImpl::PackageImpl::getLicenseText() - throw (deployment::DeploymentException, - deployment::ExtensionRemovedException, - RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -1033,9 +970,6 @@ OUString BackendImpl::PackageImpl::getLicenseText() void BackendImpl::PackageImpl::exportTo( OUString const & destFolderURL, OUString const & newTitle, sal_Int32 nameClashAction, Reference<ucb::XCommandEnvironment> const & xCmdEnv ) - throw (deployment::ExtensionRemovedException, - ucb::CommandFailedException, ucb::CommandAbortedException, - ucb::ContentCreationException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -1230,7 +1164,7 @@ void BackendImpl::PackageImpl::exportTo( } -sal_Bool BackendImpl::PackageImpl::isBundle() throw (RuntimeException, std::exception) +sal_Bool BackendImpl::PackageImpl::isBundle() { return true; } @@ -1239,9 +1173,6 @@ sal_Bool BackendImpl::PackageImpl::isBundle() throw (RuntimeException, std::exce Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle( Reference<task::XAbortChannel> const & xAbortChannel, Reference<ucb::XCommandEnvironment> const & xCmdEnv ) - throw (deployment::DeploymentException, - ucb::CommandFailedException, ucb::CommandAbortedException, - lang::IllegalArgumentException, RuntimeException, std::exception) { Sequence< Reference<deployment::XPackage> > * pBundle = m_pBundle; if (pBundle == nullptr) @@ -1634,7 +1565,6 @@ void BackendImpl::PackageImpl::scanLegacyBundle( } OUString BackendImpl::PackageImpl::getDisplayName() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index c236af97fc9a..0f98bdded730 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -100,14 +100,12 @@ public: Reference<XComponentContext> const & xComponentContext ); // XUpdatable - virtual void SAL_CALL update() throw (RuntimeException, std::exception) override; + virtual void SAL_CALL update() override; // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) override; + getSupportedPackageTypes() override; + virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override; }; @@ -184,7 +182,7 @@ bool BackendImpl::hasActiveEntry(OUString const & url) // XUpdatable -void BackendImpl::update() throw (RuntimeException, std::exception) +void BackendImpl::update() { // Nothing to do here after fixing i70283!? } @@ -192,7 +190,7 @@ void BackendImpl::update() throw (RuntimeException, std::exception) // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) +BackendImpl::getSupportedPackageTypes() { return m_typeInfos; } @@ -203,8 +201,6 @@ void BackendImpl::revokeEntryFromDb(OUString const & url) } void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) { if (m_backendDb.get()) m_backendDb->removeEntry(url); diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx index 4b283fc61838..1c86b0983b95 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx @@ -36,49 +36,41 @@ namespace sfwk // XDocumentHandler void SAL_CALL ParcelDescDocHandler::startDocument() -throw ( xml::sax::SAXException, RuntimeException, std::exception ) { m_bIsParsed = false; } void SAL_CALL ParcelDescDocHandler::endDocument() -throw ( xml::sax::SAXException, RuntimeException, std::exception ) { m_bIsParsed = true; } void SAL_CALL ParcelDescDocHandler::characters( const OUString & ) - throw ( xml::sax::SAXException, RuntimeException, std::exception ) { } void SAL_CALL ParcelDescDocHandler::ignorableWhitespace( const OUString & ) - throw ( xml::sax::SAXException, RuntimeException, std::exception ) { } void SAL_CALL ParcelDescDocHandler::processingInstruction( const OUString &, const OUString & ) - throw ( xml::sax::SAXException, RuntimeException, std::exception ) { } void SAL_CALL ParcelDescDocHandler::setDocumentLocator( const Reference< xml::sax::XLocator >& ) - throw ( xml::sax::SAXException, RuntimeException, std::exception ) { } void SAL_CALL ParcelDescDocHandler::startElement( const OUString& aName, const Reference< xml::sax::XAttributeList > & xAttribs ) - throw ( xml::sax::SAXException, - RuntimeException, std::exception ) { dp_misc::TRACE("ParcelDescDocHandler::startElement() for " + @@ -100,7 +92,6 @@ ParcelDescDocHandler::startElement( const OUString& aName, } void SAL_CALL ParcelDescDocHandler::endElement( const OUString & aName ) - throw ( xml::sax::SAXException, RuntimeException, std::exception ) { if ( skipIndex ) { diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index d637116fefae..620e01b24c3c 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -48,33 +48,24 @@ public: const OUString& getParcelLanguage() { return m_sLang; } bool isParsed() { return m_bIsParsed; } // XDocumentHandler - virtual void SAL_CALL startDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL startDocument() override; - virtual void SAL_CALL endDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL endDocument() override; virtual void SAL_CALL startElement( const OUString& aName, - const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) - throw ( css::xml::sax::SAXException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) override; - virtual void SAL_CALL endElement( const OUString & aName ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL endElement( const OUString & aName ) override; - virtual void SAL_CALL characters( const OUString & aChars ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL characters( const OUString & aChars ) override; - virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) override; virtual void SAL_CALL processingInstruction( - const OUString & aTarget, const OUString & aData ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + const OUString & aTarget, const OUString & aData ) override; virtual void SAL_CALL setDocumentLocator( - const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override; }; } } diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index adf1f93e6cf4..8893e487522f 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -78,12 +78,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend OUString const & url, OUString const & libType, bool bRemoved, OUString const & identifier); // XPackage - virtual OUString SAL_CALL getDescription() - throw (deployment::ExtensionRemovedException, - RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLicenseText() - throw (deployment::ExtensionRemovedException, - RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDescription() override; + virtual OUString SAL_CALL getLicenseText() override; }; friend class PackageImpl; @@ -103,10 +99,8 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) override; + getSupportedPackageTypes() override; + virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override; }; BackendImpl * BackendImpl::PackageImpl::getMyBackend() const @@ -124,8 +118,6 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const } OUString BackendImpl::PackageImpl::getDescription() - throw (deployment::ExtensionRemovedException, - RuntimeException, std::exception) { if (m_descr.isEmpty()) return Package::getDescription(); @@ -134,8 +126,6 @@ OUString BackendImpl::PackageImpl::getDescription() } OUString BackendImpl::PackageImpl::getLicenseText() - throw (deployment::ExtensionRemovedException, - RuntimeException, std::exception) { return Package::getDescription(); } @@ -185,14 +175,12 @@ BackendImpl::BackendImpl( // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) +BackendImpl::getSupportedPackageTypes() { return Sequence< Reference<deployment::XPackageTypeInfo> >(&m_xTypeInfo, 1); } void BackendImpl::packageRemoved(OUString const & /*url*/, OUString const & /*mediaType*/) - throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) { } |