desktop/source/deployment/misc/dp_dependencies.cxx | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
New commits: commit 42905aecfcdee9eb2c184bceeec4f8688056cd73 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Fri Apr 4 18:47:28 2014 +0200 ignore legacy OpenOffice.org-*-version, when a LibreOffice-*-version is given Change-Id: Ie5b6ffee07b6e5ebf922bad1b4a268ff636412c9 Reviewed-on: https://gerrit.libreoffice.org/8853 Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com> Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com> diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 817c9b4..696d3a7 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -103,18 +103,29 @@ check(dp_misc::DescriptionInfoset const & infoset) { css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > > unsatisfied(n); sal_Int32 unsat = 0; + // check first if minimalVersionLibreOffice is specified -- in that case ignore the legacy OOo dependencies + bool bIgnoreOoo = false; + for (sal_Int32 i = 0; i < n; ++i) { + css::uno::Reference< css::xml::dom::XElement > e( + deps->item(i), css::uno::UNO_QUERY_THROW); + if ( e->getNamespaceURI() == namespaceLibreOffice && e->getTagName() == minimalVersionLibreOffice) + { + bIgnoreOoo = true; + break; + } + } for (sal_Int32 i = 0; i < n; ++i) { css::uno::Reference< css::xml::dom::XElement > e( deps->item(i), css::uno::UNO_QUERY_THROW); bool sat = false; if ( e->getNamespaceURI() == namespaceOpenOfficeOrg && e->getTagName() == minimalVersionOpenOfficeOrg ) { - sat = satisfiesMinimalVersion( + sat = bIgnoreOoo || satisfiesMinimalVersion( getReferenceOpenOfficeOrgMajorMinor(), e->getAttribute("value")); } else if ( e->getNamespaceURI() == namespaceOpenOfficeOrg && e->getTagName() == maximalVersionOpenOfficeOrg ) { - sat = satisfiesMaximalVersion( + sat = bIgnoreOoo || satisfiesMaximalVersion( getReferenceOpenOfficeOrgMajorMinor(), e->getAttribute("value")); } else if (e->getNamespaceURI() == namespaceLibreOffice && e->getTagName() == minimalVersionLibreOffice )
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits