diff options
Diffstat (limited to 'desktop/source/deployment/registry/component')
3 files changed, 18 insertions, 16 deletions
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx index 05f265404f55..37356fd78333 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx @@ -67,22 +67,22 @@ void ComponentBackendDb::addEntry(OUString const & url, Data const & data) if (!activateEntry(url)) { Reference<css::xml::dom::XNode> componentNode = writeKeyElement(url); - writeSimpleElement("java-type-library", + writeSimpleElement(u"java-type-library", OUString::boolean(data.javaTypeLibrary), componentNode); writeSimpleList( data.implementationNames, - "implementation-names", - "name", + u"implementation-names", + u"name", componentNode); writeVectorOfPair( data.singletons, - "singletons", - "item", - "key", - "value", + u"singletons", + u"item", + u"key", + u"value", componentNode); save(); @@ -97,7 +97,7 @@ void ComponentBackendDb::addEntry(OUString const & url, Data const & data) } } -ComponentBackendDb::Data ComponentBackendDb::getEntry(OUString const & url) +ComponentBackendDb::Data ComponentBackendDb::getEntry(std::u16string_view url) { try { @@ -105,14 +105,14 @@ ComponentBackendDb::Data ComponentBackendDb::getEntry(OUString const & url) Reference<css::xml::dom::XNode> aNode = getKeyElement(url); if (aNode.is()) { - bool bJava = readSimpleElement("java-type-library", aNode) == "true"; + bool bJava = readSimpleElement(u"java-type-library", aNode) == "true"; retData.javaTypeLibrary = bJava; retData.implementationNames = - readList( aNode, "implementation-names", "name"); + readList( aNode, u"implementation-names", u"name"); retData.singletons = - readVectorOfPair( aNode, "singletons", "item", "key", "value"); + readVectorOfPair( aNode, u"singletons", u"item", u"key", u"value"); } return retData; } diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx index e1797056d498..84153b6fa259 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx @@ -23,6 +23,8 @@ #include <rtl/string.hxx> #include <vector> #include <deque> +#include <string_view> + #include <dp_backenddb.hxx> namespace com::sun::star::uno { class XComponentContext; } @@ -81,7 +83,7 @@ public: void addEntry(OUString const & url, Data const & data); - Data getEntry(OUString const & url); + Data getEntry(std::u16string_view url); }; diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 3ff6d653477a..5bf230c17f68 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -287,8 +287,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend std::unique_ptr<ComponentBackendDb> m_backendDb; void addDataToDb(OUString const & url, ComponentBackendDb::Data const & data); - ComponentBackendDb::Data readDataFromDb(OUString const & url); - void revokeEntryFromDb(OUString const & url); + ComponentBackendDb::Data readDataFromDb(std::u16string_view url); + void revokeEntryFromDb(std::u16string_view url); Reference<registry::XSimpleRegistry> m_xCommonRDB; Reference<registry::XSimpleRegistry> m_xNativeRDB; @@ -576,7 +576,7 @@ void BackendImpl::addDataToDb( m_backendDb->addEntry(url, data); } -ComponentBackendDb::Data BackendImpl::readDataFromDb(OUString const & url) +ComponentBackendDb::Data BackendImpl::readDataFromDb(std::u16string_view url) { ComponentBackendDb::Data data; if (m_backendDb) @@ -584,7 +584,7 @@ ComponentBackendDb::Data BackendImpl::readDataFromDb(OUString const & url) return data; } -void BackendImpl::revokeEntryFromDb(OUString const & url) +void BackendImpl::revokeEntryFromDb(std::u16string_view url) { if (m_backendDb) m_backendDb->revokeEntry(url); |