diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-17 09:32:42 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-17 09:32:42 +0000 |
| commit | 869ba3880dfb6728a1a840900e42d350283425be (patch) | |
| tree | 59f437507c448e35dad6d661137c4c7ea470dbe6 /desktop/source/deployment/registry/package | |
| parent | 53d3ab2be56f30ff6b9d1cf6363c8266e13842d3 (diff) | |
INTEGRATION: CWS jl51 (1.17.34); FILE MERGED
2007/04/02 14:13:02 jl 1.17.34.3: RESYNC: (1.18-1.19); FILE MERGED
2007/02/02 13:19:18 jl 1.17.34.2: RESYNC: (1.17-1.18); FILE MERGED
2007/01/19 14:57:52 jl 1.17.34.1: #73307# Removed error box when user declined the license.
Diffstat (limited to 'desktop/source/deployment/registry/package')
| -rw-r--r-- | desktop/source/deployment/registry/package/dp_package.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 01a897ccb4..9ab591cd2c 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dp_package.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: obo $ $Date: 2007-03-14 13:18:04 $ + * last change: $Author: ihi $ $Date: 2007-04-17 10:32:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -735,10 +735,11 @@ bool BackendImpl::PackageImpl::checkDependencies( if (approve == true) return true; else - throw css::deployment::DeploymentException( - OUSTR("Extension Manager: User declined the license."), - static_cast<OWeakObject*>(this), - Any( css::deployment::LicenseException(OUSTR("User declined the license."), 0, m_name, sLicense))); + return false; + //throw css::deployment::DeploymentException( + // OUSTR("Extension Manager: User declined the license."), + // static_cast<OWeakObject*>(this), + // Any( css::deployment::LicenseException(OUSTR("User declined the license."), 0, m_name, sLicense))); } return true; } catch (css::ucb::CommandFailedException&) { |