diff options
Diffstat (limited to 'desktop/source/deployment/manager')
5 files changed, 12 insertions, 10 deletions
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 62063f81e148..2a17e2d6860c 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -54,6 +54,7 @@ #include <vector> #include <algorithm> #include <set> +#include <string_view> namespace lang = com::sun::star::lang; namespace task = com::sun::star::task; @@ -566,7 +567,7 @@ bool ExtensionManager::doChecksForAddExtension( } //Prevent showing the license if requested. Reference<ucb::XCommandEnvironment> _xCmdEnv(xCmdEnv); - ExtensionProperties props(OUString(), properties, Reference<ucb::XCommandEnvironment>(), m_xContext); + ExtensionProperties props(std::u16string_view(), properties, Reference<ucb::XCommandEnvironment>(), m_xContext); dp_misc::DescriptionInfoset info(dp_misc::getDescriptionInfoset(xTmpExtension->getURL())); const ::std::optional<dp_misc::SimpleLicenseAttributes> licenseAttributes = diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 22fd91370f11..5ff55abe6b33 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -974,7 +974,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( - OUString const & id, ActivePackages::Data const & data, + std::u16string_view id, ActivePackages::Data const & data, Reference<XCommandEnvironment> const & xCmdEnv, bool ignoreAlienPlatforms ) { if (ignoreAlienPlatforms) diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index 335099d3215d..ec34461aa6f7 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -27,7 +27,7 @@ #include <com/sun/star/deployment/XPackageRegistry.hpp> #include <com/sun/star/deployment/XPackageManager.hpp> #include <memory> - +#include <string_view> namespace dp_manager { @@ -173,7 +173,7 @@ public: OUString const & id, OUString const & fileName, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ); css::uno::Reference<css::deployment::XPackage> getDeployedPackage_( - OUString const & id, ActivePackages::Data const & data, + std::u16string_view id, ActivePackages::Data const & data, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, bool ignoreAlienPlatforms = false ); virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx index ab5ccc7eb5c7..92d7191111d3 100644 --- a/desktop/source/deployment/manager/dp_properties.cxx +++ b/desktop/source/deployment/manager/dp_properties.cxx @@ -41,12 +41,12 @@ namespace dp_manager { //Reading the file ExtensionProperties::ExtensionProperties( - OUString const & urlExtension, + std::u16string_view urlExtension, Reference<ucb::XCommandEnvironment> const & xCmdEnv, Reference<uno::XComponentContext> const & xContext) : m_xCmdEnv(xCmdEnv), m_xContext(xContext) { - m_propFileUrl = urlExtension + "properties"; + m_propFileUrl = OUString::Concat(urlExtension) + "properties"; std::vector< std::pair< OUString, OUString> > props; if (! dp_misc::create_ucb_content(nullptr, m_propFileUrl, nullptr, false)) @@ -64,13 +64,13 @@ ExtensionProperties::ExtensionProperties( //Writing the file ExtensionProperties::ExtensionProperties( - OUString const & urlExtension, + std::u16string_view urlExtension, uno::Sequence<css::beans::NamedValue> const & properties, Reference<ucb::XCommandEnvironment> const & xCmdEnv, Reference<uno::XComponentContext> const & xContext) : m_xCmdEnv(xCmdEnv), m_xContext(xContext) { - m_propFileUrl = urlExtension + "properties"; + m_propFileUrl = OUString::Concat(urlExtension) + "properties"; for (css::beans::NamedValue const & v : properties) { diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx index d87e2951ccb2..06139ece3c7d 100644 --- a/desktop/source/deployment/manager/dp_properties.hxx +++ b/desktop/source/deployment/manager/dp_properties.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <optional> +#include <string_view> namespace dp_manager { @@ -37,11 +38,11 @@ class ExtensionProperties final static OUString getPropertyValue(css::beans::NamedValue const& v); public: - ExtensionProperties(OUString const& urlExtension, + ExtensionProperties(std::u16string_view urlExtension, css::uno::Reference<css::ucb::XCommandEnvironment> const& xCmdEnv, css::uno::Reference<css::uno::XComponentContext> const& xContext); - ExtensionProperties(OUString const& urlExtension, + ExtensionProperties(std::u16string_view urlExtension, css::uno::Sequence<css::beans::NamedValue> const& properties, css::uno::Reference<css::ucb::XCommandEnvironment> const& xCmdEnv, css::uno::Reference<css::uno::XComponentContext> const& xContext); |