mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS jl101 (1.27.6); FILE MERGED

Browse Source 
2008/05/28 15:03:57 jl 1.27.6.2: RESYNC: (1.27-1.28); FILE MERGED
2008/05/28 14:41:10 jl 1.27.6.1: #i84453# Throwin exception DeploymentException if there is a missing license text element
This commit is contained in:
Rüdiger Timm
2008-06-06 07:41:39 +00:00
parent c66ae68bed
commit 000b386147
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
desktop/source/deployment/registry/package/dp_package.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: dp_package.cxx,v $ * $RCSfile: dp_package.cxx,v $
* $Revision: 1.29 $ * $Revision: 1.30 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -585,9 +585,14 @@ bool BackendImpl::PackageImpl::checkDependencies(
if (!nodeSimpleLic.is()) if (!nodeSimpleLic.is())
return true; return true;
//throws an exception if nothing adequate was found OUString sLic = getDescriptionInfoset().getLocalizedLicenseURL();
OUString sHref = desc.getExtensionRootUrl() + OUSTR("/") //If we do not get a localized licence then there is an error in the description.xml
+ getDescriptionInfoset().getLocalizedLicenseURL(); //This should be handled by using a validating parser. Therefore we assume that no
//license is available.
if (sLic.getLength() == 0)
throw css::deployment::DeploymentException(
OUSTR("Could not obtain path to license. Possible error in description.xml"), 0, Any());
OUString sHref = desc.getExtensionRootUrl() + OUSTR("/") + sLic;
OUString sLicense = getLicenseText(xCmdEnv, sHref); OUString sLicense = getLicenseText(xCmdEnv, sHref);
//determine who has to agree to the license //determine who has to agree to the license
css::uno::Reference<css::xml::xpath::XXPathObject> nodeAttribWho3 = css::uno::Reference<css::xml::xpath::XXPathObject> nodeAttribWho3 =