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

INTEGRATION: CWS xmlfix2 (1.24.102); FILE MERGED

Browse Source 
2008/05/15 17:30:22 mst 1.24.102.2: RESYNC: (1.24-1.27); FILE MERGED
2008/03/31 14:37:07 mst 1.24.102.1: #i81678#: interface change: XXPathAPI
- desktop/source/deployment/registry/package/dp_package.cxx,
  desktop/source/deployment/misc/dp_descriptioninfoset.cxx,
  desktop/source/deployment/gui/dp_gui_update{,install}dialog.cxx:
  + adapt to changes in css.xml.xpath.XXPathAPI
This commit is contained in:
Rüdiger Timm
2008-06-06 11:18:21 +00:00
parent 4c96d00bfb
commit d2fb49ea46
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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.30 $ * $Revision: 1.31 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -579,9 +579,13 @@ bool BackendImpl::PackageImpl::checkDependencies(
css::uno::Reference<css::xml::xpath::XXPathAPI> xPath = css::uno::Reference<css::xml::xpath::XXPathAPI> xPath =
getDescriptionInfoset().getXpath(); getDescriptionInfoset().getXpath();
css::uno::Reference<css::xml::dom::XNode> nodeSimpleLic = css::uno::Reference<css::xml::dom::XNode> nodeSimpleLic;
xPath->selectSingleNode(xRoot, try {
nodeSimpleLic = xPath->selectSingleNode(xRoot,
OUSTR("/desc:description/desc:registration/desc:simple-license")); OUSTR("/desc:description/desc:registration/desc:simple-license"));
} catch (css::xml::xpath::XPathException &) {
// ignore
}
if (!nodeSimpleLic.is()) if (!nodeSimpleLic.is())
return true; return true;