diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-14 12:18:04 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-14 12:18:04 +0000 |
| commit | b6301b3adf079017486db90a9c0d7876b6259249 (patch) | |
| tree | 8b4b752ac64fe5f4fc5cf51bdcc0b246f31e2cf1 /desktop/source/deployment/registry/package/dp_package.cxx | |
| parent | e648a3b0309addc205239f939071899932e1cdb0 (diff) | |
INTEGRATION: CWS jl57 (1.18.16); FILE MERGED
2007/02/08 13:12:59 jl 1.18.16.1: #i73475# build breaks with gcc3
Diffstat (limited to 'desktop/source/deployment/registry/package/dp_package.cxx')
| -rw-r--r-- | desktop/source/deployment/registry/package/dp_package.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index f8e5e0cfa6..01a897ccb4 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.18 $ + * $Revision: 1.19 $ * - * last change: $Author: vg $ $Date: 2007-01-18 14:55:59 $ + * last change: $Author: obo $ $Date: 2007-03-14 13:18:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -660,9 +660,9 @@ bool BackendImpl::PackageImpl::checkDependencies( try { css::uno::Reference<css::xml::dom::XNode> xRoot = desc.getRootElement(); - css::uno::Reference<css::xml::xpath::XXPathAPI> xPath( + css::uno::Reference<css::xml::xpath::XXPathAPI> xPath = DescriptionInfoset(getMyBackend()->getComponentContext(), xRoot). - getXpath()); + getXpath(); css::uno::Reference<css::xml::dom::XNode> nodeSimpleLic = xPath->selectSingleNode(xRoot, @@ -688,7 +688,8 @@ bool BackendImpl::PackageImpl::checkDependencies( OSL_ASSERT(aContextName.getLength()); if (sAccept.equals(OUSTR("user")) && aContextName.equals(OUSTR("shared"))) { - css::deployment::LicenseIndividualAgreementException exc(OUString(), 0, m_name); + css::deployment::LicenseIndividualAgreementException exc = + css::deployment::LicenseIndividualAgreementException(OUString(), 0, m_name); bool approve = false; bool abort = false; @@ -722,7 +723,8 @@ bool BackendImpl::PackageImpl::checkDependencies( if ( !(bInstalled && bSuppress)) { - css::deployment::LicenseException licExc(OUString(), 0, m_name, sLicense); + css::deployment::LicenseException licExc = + css::deployment::LicenseException(OUString(), 0, m_name, sLicense); bool approve = false; bool abort = false; if (! interactContinuation( |