diff options
Diffstat (limited to 'desktop/source/deployment/misc/dp_dependencies.cxx')
-rw-r--r-- | desktop/source/deployment/misc/dp_dependencies.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 16e2590bd8a2..eea3cfba9cde 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -43,14 +43,14 @@ namespace { char const namespaceLibreOffice[] = "http://libreoffice.org/extensions/description/2011"; -constexpr OUStringLiteral namespaceOpenOfficeOrg = - u"http://openoffice.org/extensions/description/2006"; +constexpr OUString namespaceOpenOfficeOrg = + u"http://openoffice.org/extensions/description/2006"_ustr; char const minimalVersionLibreOffice[] = "LibreOffice-minimal-version"; char const maximalVersionLibreOffice[] = "LibreOffice-maximal-version"; -constexpr OUStringLiteral minimalVersionOpenOfficeOrg = - u"OpenOffice.org-minimal-version"; +constexpr OUString minimalVersionOpenOfficeOrg = + u"OpenOffice.org-minimal-version"_ustr; char const maximalVersionOpenOfficeOrg[] = "OpenOffice.org-maximal-version"; @@ -73,13 +73,13 @@ OUString getReferenceOpenOfficeOrgMajorMinor() { } bool satisfiesMinimalVersion( - OUString const & actual, OUString const & specified) + std::u16string_view actual, std::u16string_view specified) { return dp_misc::compareVersions(actual, specified) != dp_misc::LESS; } bool satisfiesMaximalVersion( - OUString const & actual, OUString const & specified) + std::u16string_view actual, std::u16string_view specified) { return dp_misc::compareVersions(actual, specified) != dp_misc::GREATER; } @@ -104,6 +104,7 @@ check(dp_misc::DescriptionInfoset const & infoset) { sal_Int32 n = deps->getLength(); css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > > unsatisfied(n); + auto unsatisfiedRange = asNonConstRange(unsatisfied); sal_Int32 unsat = 0; // check first if minimalVersionLibreOffice is specified -- in that case ignore the legacy OOo dependencies bool bIgnoreOoo = false; @@ -147,7 +148,7 @@ check(dp_misc::DescriptionInfoset const & infoset) { minimalVersionOpenOfficeOrg)); } if (!sat) { - unsatisfied[unsat++] = e; + unsatisfiedRange[unsat++] = e; } } unsatisfied.realloc(unsat); |