diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /stoc/source/security | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) |
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.
Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly). The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually). There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).
Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code. Missing @throws
documentation has not been applied in such manual clean-up.
Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'stoc/source/security')
-rw-r--r-- | stoc/source/security/access_controller.cxx | 48 | ||||
-rw-r--r-- | stoc/source/security/file_policy.cxx | 24 |
2 files changed, 18 insertions, 54 deletions
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 1bc162ab703a..193c98482569 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -85,8 +85,7 @@ public: // XAccessControlContext impl virtual void SAL_CALL checkPermission( - Any const & perm ) - throw (RuntimeException, std::exception) override; + Any const & perm ) override; }; inline acc_Intersection::acc_Intersection( @@ -109,7 +108,6 @@ inline Reference< security::XAccessControlContext > acc_Intersection::create( void acc_Intersection::checkPermission( Any const & perm ) - throw (RuntimeException, std::exception) { m_x1->checkPermission( perm ); m_x2->checkPermission( perm ); @@ -133,8 +131,7 @@ public: // XAccessControlContext impl virtual void SAL_CALL checkPermission( - Any const & perm ) - throw (RuntimeException, std::exception) override; + Any const & perm ) override; }; inline acc_Union::acc_Union( @@ -157,7 +154,6 @@ inline Reference< security::XAccessControlContext > acc_Union::create( void acc_Union::checkPermission( Any const & perm ) - throw (RuntimeException, std::exception) { try { @@ -184,13 +180,11 @@ public: // XAccessControlContext impl virtual void SAL_CALL checkPermission( - Any const & perm ) - throw (RuntimeException, std::exception) override; + Any const & perm ) override; }; void acc_Policy::checkPermission( Any const & perm ) - throw (RuntimeException, std::exception) { m_permissions.checkPermission( perm ); } @@ -209,8 +203,7 @@ public: Reference< security::XAccessControlContext > const & xRestriction ); // XCurrentContext impl - virtual Any SAL_CALL getValueByName( OUString const & name ) - throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL getValueByName( OUString const & name ) override; }; inline acc_CurrentContext::acc_CurrentContext( @@ -226,7 +219,6 @@ inline acc_CurrentContext::acc_CurrentContext( } Any acc_CurrentContext::getValueByName( OUString const & name ) - throw (RuntimeException, std::exception) { if (name == s_acRestriction) { @@ -326,31 +318,23 @@ public: // XInitialization impl virtual void SAL_CALL initialize( - Sequence< Any > const & arguments ) - throw (Exception, std::exception) override; + Sequence< Any > const & arguments ) override; // XAccessController impl virtual void SAL_CALL checkPermission( - Any const & perm ) - throw (RuntimeException, std::exception) override; + Any const & perm ) override; virtual Any SAL_CALL doRestricted( Reference< security::XAction > const & xAction, - Reference< security::XAccessControlContext > const & xRestriction ) - throw (Exception, std::exception) override; + Reference< security::XAccessControlContext > const & xRestriction ) override; virtual Any SAL_CALL doPrivileged( Reference< security::XAction > const & xAction, - Reference< security::XAccessControlContext > const & xRestriction ) - throw (Exception, std::exception) override; - virtual Reference< security::XAccessControlContext > SAL_CALL getContext() - throw (RuntimeException, std::exception) override; + Reference< security::XAccessControlContext > const & xRestriction ) override; + virtual Reference< security::XAccessControlContext > SAL_CALL getContext() override; // XServiceInfo impl - virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - 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 & serviceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; AccessController::AccessController( Reference< XComponentContext > const & xComponentContext ) @@ -426,7 +410,6 @@ void AccessController::disposing() void AccessController::initialize( Sequence< Any > const & arguments ) - throw (Exception, std::exception) { // xxx todo: review for forking // portal forking hack: re-initialize for another user-id @@ -748,7 +731,6 @@ PermissionCollection AccessController::getEffectivePermissions( void AccessController::checkPermission( Any const & perm ) - throw (RuntimeException, std::exception) { if (rBHelper.bDisposed) { @@ -778,7 +760,6 @@ void AccessController::checkPermission( Any AccessController::doRestricted( Reference< security::XAction > const & xAction, Reference< security::XAccessControlContext > const & xRestriction ) - throw (Exception, std::exception) { if (rBHelper.bDisposed) { @@ -811,7 +792,6 @@ Any AccessController::doRestricted( Any AccessController::doPrivileged( Reference< security::XAction > const & xAction, Reference< security::XAccessControlContext > const & xRestriction ) - throw (Exception, std::exception) { if (rBHelper.bDisposed) { @@ -846,7 +826,6 @@ Any AccessController::doPrivileged( } Reference< security::XAccessControlContext > AccessController::getContext() - throw (RuntimeException, std::exception) { if (rBHelper.bDisposed) { @@ -870,19 +849,16 @@ Reference< security::XAccessControlContext > AccessController::getContext() // XServiceInfo impl OUString AccessController::getImplementationName() - throw (RuntimeException, std::exception) { return OUString("com.sun.star.security.comp.stoc.AccessController"); } sal_Bool AccessController::supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } Sequence< OUString > AccessController::getSupportedServiceNames() - throw (RuntimeException, std::exception) { Sequence<OUString> aSNS { SERVICE_NAME }; return aSNS; diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index bc3f3fe0e0be..6fada62ca405 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -75,20 +75,14 @@ public: // XPolicy impl virtual Sequence< Any > SAL_CALL getPermissions( - OUString const & userId ) - throw (RuntimeException, std::exception) override; - virtual Sequence< Any > SAL_CALL getDefaultPermissions() - throw (RuntimeException, std::exception) override; - virtual void SAL_CALL refresh() - throw (RuntimeException, std::exception) override; + OUString const & userId ) override; + virtual Sequence< Any > SAL_CALL getDefaultPermissions() override; + virtual void SAL_CALL refresh() override; // XServiceInfo impl - virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - 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 & serviceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; FilePolicy::FilePolicy( Reference< XComponentContext > const & xComponentContext ) @@ -108,7 +102,6 @@ void FilePolicy::disposing() Sequence< Any > FilePolicy::getPermissions( OUString const & userId ) - throw (RuntimeException, std::exception) { if (! m_init) { @@ -129,7 +122,6 @@ Sequence< Any > FilePolicy::getPermissions( } Sequence< Any > FilePolicy::getDefaultPermissions() - throw (RuntimeException, std::exception) { if (! m_init) { @@ -385,7 +377,6 @@ PolicyReader::~PolicyReader() void FilePolicy::refresh() - throw (RuntimeException, std::exception) { // read out file (the .../file-name value had originally been set in // cppu::add_access_control_entries (cppuhelper/source/servicefactory.cxx) @@ -491,19 +482,16 @@ void FilePolicy::refresh() OUString FilePolicy::getImplementationName() - throw (RuntimeException, std::exception) { return OUString(IMPL_NAME); } sal_Bool FilePolicy::supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } Sequence< OUString > FilePolicy::getSupportedServiceNames() - throw (RuntimeException, std::exception) { Sequence<OUString> aSNS { "com.sun.star.security.Policy" }; return aSNS; |