diff options
Diffstat (limited to 'stoc/source/security/access_controller.cxx')
-rw-r--r-- | stoc/source/security/access_controller.cxx | 48 |
1 files changed, 12 insertions, 36 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; |